rpms/qjackctl/devel qjackctl-0.3.3-qt45.patch, NONE, 1.1 qjackctl.spec, 1.12, 1.13

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/qjackctl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17061/devel

Modified Files:
	qjackctl.spec 
Added Files:
	qjackctl-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
- Fix close button not shown with Qt 4.5 (#494471)

qjackctl-0.3.3-qt45.patch:

--- NEW FILE qjackctl-0.3.3-qt45.patch ---
diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp
--- qjackctl-0.3.4.old/src/main.cpp	2008-10-26 11:37:55.000000000 -0400
+++ qjackctl-0.3.4/src/main.cpp	2009-04-06 22:23:44.000000000 -0400
@@ -300,6 +300,9 @@ int main ( int argc, char **argv )
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint
diff -rupN qjackctl-0.3.4.old/src/qjackctlMainForm.cpp qjackctl-0.3.4/src/qjackctlMainForm.cpp
--- qjackctl-0.3.4.old/src/qjackctlMainForm.cpp	2008-10-02 12:18:12.000000000 -0400
+++ qjackctl-0.3.4/src/qjackctlMainForm.cpp	2009-04-06 22:25:28.000000000 -0400
@@ -370,6 +370,9 @@ bool qjackctlMainForm::setup ( qjackctlS
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
 		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+		| Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qjackctl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qjackctl/devel/qjackctl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qjackctl.spec	25 Feb 2009 17:36:13 -0000	1.12
+++ qjackctl.spec	10 Apr 2009 22:32:51 -0000	1.13
@@ -3,10 +3,12 @@
 Summary: Qt based JACK control application
 Name: qjackctl
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
+# Fix close button not shown with Qt 4.5 (#494471)
+Patch0: qjackctl-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -26,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt45
 
 %build
 ls -l /usr/lib*/qt4/bin
@@ -76,7 +79,10 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-3
+- Fix close button not shown with Qt 4.5 (#494471)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Jul 08 2008 Anthony Green <green at redhat.com> 0.3.3-1