From 432efbb12930b5185f03bd3fc668e70740ec2fda Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Apr 10 2009 22:32:51 +0000 Subject: - Fix close button not shown with Qt 4.5 (#494471) --- diff --git a/qjackctl-0.3.3-qt45.patch b/qjackctl-0.3.3-qt45.patch new file mode 100644 index 0000000..c85e6f8 --- /dev/null +++ b/qjackctl-0.3.3-qt45.patch @@ -0,0 +1,26 @@ +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 diff --git a/qjackctl.spec b/qjackctl.spec index 661f945..d7cd712 100644 --- a/qjackctl.spec +++ b/qjackctl.spec @@ -3,10 +3,12 @@ Summary: Qt based JACK control application Name: qjackctl Version: 0.3.3 -Release: 1%{?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 @@ patchbay and connection control features. %prep %setup -q +%patch0 -p1 -b .qt45 %build ls -l /usr/lib*/qt4/bin @@ -76,6 +79,12 @@ fi %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop %changelog +* Fri Apr 10 2009 Kevin Kofler 0.3.3-3 +- Fix close button not shown with Qt 4.5 (#494471) + +* Wed Feb 25 2009 Fedora Release Engineering 0.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Jul 08 2008 Anthony Green 0.3.3-1 - Upgrade source.