rpms/qt/F-9 qt-x11-opensource-src-4.4.1-systray.patch, NONE, 1.1 qt.spec, 1.180, 1.181 sources, 1.34, 1.35

Than Ngo (than) fedora-extras-commits at redhat.com
Wed Aug 6 08:10:28 UTC 2008


Author: than

Update of /cvs/extras/rpms/qt/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945

Modified Files:
	qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.4.1-systray.patch 
Log Message:
4.4.1


qt-x11-opensource-src-4.4.1-systray.patch:

--- NEW FILE qt-x11-opensource-src-4.4.1-systray.patch ---
--- qt/src/gui/kernel/qwidget.cpp	2008-08-01 16:08:30.000000000 +0100
+++ qt/src/gui/kernel/qwidget.cpp	2008-08-05 11:22:40.000000000 +0100
@@ -9095,8 +9095,6 @@
         break;
 #endif
     case Qt::WA_NativeWindow:
-        if (!qApp->testAttribute(Qt::AA_DontCreateNativeWidgetSiblings) && parentWidget())
-            parentWidget()->d_func()->enforceNativeChildren();
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
         break;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/qt.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- qt.spec	6 Aug 2008 03:16:44 -0000	1.180
+++ qt.spec	6 Aug 2008 08:09:57 -0000	1.181
@@ -7,8 +7,8 @@
 %else
 Name:    qt4
 %endif
-Version: 4.4.0
-Release: 17%{?dist}
+Version: 4.4.1
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -37,9 +37,10 @@
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
+Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080723
+%define qt_copy 20080805
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -277,6 +278,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
+%patch10 -p1 -b .systray
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -558,7 +560,6 @@
 %doc README* 
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
-%doc LICENSE.QPL
 #config /etc/profile.d/qt4.*
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
@@ -725,6 +726,9 @@
 
 
 %changelog
+* Tue Aug 05 2008 Than Ngo <than at redhat.com> -  4.4.1-1
+- 4.4.1
+
 * Tue Aug 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-17
 - fold -sqlite subpkg into main (#454930)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/F-9/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	6 Aug 2008 03:16:44 -0000	1.34
+++ sources	6 Aug 2008 08:09:57 -0000	1.35
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-bb7e7e6aa739c0c87e3cb3dbfe0fa814  qt-copy-patches-20080723svn.tar.bz2
-03ee0deb73908c84a7b4d9ceb5f8b3f6  qt-x11-opensource-src-4.4.0.tar.bz2
+a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
+21597a6486886398a7b771d240ad346b  qt-copy-patches-20080805svn.tar.bz2




More information about the fedora-extras-commits mailing list