From c691992c3b96e232e781a67fe35ce9d513f8e83a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jun 16 2008 14:40:15 +0000
Subject: - fix-combobox-window-type patch (maniac103)


---

diff --git a/qt-x11-fix-combobox-window-type.patch b/qt-x11-fix-combobox-window-type.patch
new file mode 100644
index 0000000..509f8b0
--- /dev/null
+++ b/qt-x11-fix-combobox-window-type.patch
@@ -0,0 +1,25 @@
+--- src/gui/widgets/qcombobox.cpp.orig	2008-06-05 09:29:49.000000000 +0200
++++ src/gui/widgets/qcombobox.cpp	2008-06-05 09:30:56.000000000 +0200
+@@ -339,10 +339,6 @@
+             combo->update();
+         }
+     }
+-#ifdef Q_WS_X11
+-    x11SetWindowType( X11WindowTypeCombo );
+-    x11SetWindowTransient( combo->topLevelWidget());
+-#endif
+ }
+ 
+ void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e)
+@@ -419,6 +415,11 @@
+     layout->insertSpacing(0, 0);
+     layout->addSpacing(0);
+     updateTopBottomMargin();
++
++#ifdef Q_WS_X11
++    x11SetWindowType(X11WindowTypeCombo);
++    x11SetWindowTransient(combo->topLevelWidget());
++#endif
+ }
+ 
+ void QComboBoxPrivateContainer::scrollItemView(int action)
diff --git a/qt.spec b/qt.spec
index 2fc10c1..3c526c0 100644
--- a/qt.spec
+++ b/qt.spec
@@ -8,7 +8,7 @@ Name:    qt
 Name:    qt4
 %endif
 Version: 4.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -40,6 +40,8 @@ Patch6: qt-x11-opensource-src-4.3.4-openssl.patch
 Patch7: qt4-sparc64-qvector.patch
 # kill hardcoded font substitutions (#447298)
 Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
+# 
+Patch9: qt-x11-fix-combobox-window-type.patch
 
 ## qt-copy patches
 %define qt_copy 20080528
@@ -289,6 +291,7 @@ sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_sym
 %endif
 %patch7 -p1 -b .sparc64
 %patch8 -p1 -b .font-aliases
+%patch9 -p0 -b .fix-combobox-window-type
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -704,6 +707,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Mon Jun 16 2008 Rex Dieter <rdieter@fedoraproject.org> 4.3.5-2
+- fix-combobox-window-type patch (maniac103)
+
 * Wed May 28 2008 Rex Dieter <rdieter@fedoraproject.org> 4.3.5-1
 - qt-x11-opensource-src-4.3.5
 - qt-copy 20080528 patches