From 210bb38c4ba6e6fd7a8a21e5269e245bf81e924a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sep 22 2008 10:25:28 +0000 Subject: 4.4.2 --- diff --git a/qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch b/qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch new file mode 100644 index 0000000..1b6a1e8 --- /dev/null +++ b/qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch @@ -0,0 +1,10 @@ +--- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH 2006-11-27 11:26:03.000000000 -0600 ++++ qt-x11-opensource-src-4.2.2/qmake/project.cpp 2007-02-26 13:45:39.000000000 -0600 +@@ -498,6 +498,7 @@ + ret << ((*it) + concat); + } + ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat; ++ ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat; + + return ret; + } diff --git a/qt-x11-opensource-src-4.2.2-multilib-optflags.patch b/qt-x11-opensource-src-4.2.2-multilib-optflags.patch new file mode 100644 index 0000000..099a8a2 --- /dev/null +++ b/qt-x11-opensource-src-4.2.2-multilib-optflags.patch @@ -0,0 +1,33 @@ +--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 ++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf 2007-02-26 15:01:02.000000000 -0600 +@@ -14,6 +14,8 @@ + QMAKE_CFLAGS = -m64 + QMAKE_LFLAGS = -m64 + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/g++.conf) + include(../common/linux.conf) + +--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 ++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf 2007-02-26 15:01:34.000000000 -0600 +@@ -11,6 +11,8 @@ + QMAKE_CFLAGS = -m32 + QMAKE_LFLAGS = -m32 + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/g++.conf) + include(../common/linux.conf) + load(qt_config) +--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 ++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf 2007-02-26 15:01:26.000000000 -0600 +@@ -8,6 +8,8 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + ++QMAKE_CFLAGS_RELEASE += -O2 ++ + include(../common/g++.conf) + include(../common/linux.conf) + load(qt_config) diff --git a/qt-x11-opensource-src-4.2.2-multilib.patch b/qt-x11-opensource-src-4.2.2-multilib.patch deleted file mode 100644 index 39c821d..0000000 --- a/qt-x11-opensource-src-4.2.2-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf 2007-02-26 15:01:02.000000000 -0600 -@@ -14,6 +14,8 @@ - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf 2007-02-26 15:01:34.000000000 -0600 -@@ -11,6 +11,8 @@ - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - load(qt_config) ---- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib 2006-11-27 11:26:42.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf 2007-02-26 15:01:26.000000000 -0600 -@@ -8,6 +8,8 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - -+QMAKE_CFLAGS_RELEASE += -O2 -+ - include(../common/g++.conf) - include(../common/linux.conf) - load(qt_config) ---- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH 2006-11-27 11:26:03.000000000 -0600 -+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp 2007-02-26 13:45:39.000000000 -0600 -@@ -498,6 +498,7 @@ - ret << ((*it) + concat); - } - ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat; -+ ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat; - - return ret; - } diff --git a/qt-x11-opensource-src-4.4.1-systray.patch b/qt-x11-opensource-src-4.4.1-systray.patch deleted file mode 100644 index f2e2563..0000000 --- a/qt-x11-opensource-src-4.4.1-systray.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; diff --git a/qt.spec b/qt.spec index 72b4f4a..77d10d7 100644 --- a/qt.spec +++ b/qt.spec @@ -8,8 +8,8 @@ Epoch: 1 %else Name: qt4 %endif -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.4.2 +Release: 1%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 with exceptions or GPLv2 with exceptions @@ -30,17 +30,17 @@ Source4: Trolltech.conf Source5: qconfig-multilib.h # multilib hacks -Patch2: qt-x11-opensource-src-4.2.2-multilib.patch +Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch +Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch # kill hardcoded font substitutions (#447298) Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch # 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 20080805 +%define qt_copy 20080920 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}} @@ -269,16 +269,21 @@ Qt libraries which are used for drawing widgets and OpenGL items. %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2} %if 0%{?qt_copy:1} +echo "0242" >> patches/DISABLED +echo "0250" >> patches/DISABLED +echo "0251" >> patches/DISABLED test -x apply_patches && ./apply_patches %endif # don't use -b on mkspec files, else they get installed too. # multilib hacks no longer required %patch2 -p1 +%if "%{_qt4_datadir}" != "%{_qt4_prefix}" +%patch3 -p1 -b .multilib-QMAKEPATH +%endif %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'` @@ -726,6 +731,13 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sat Sep 20 2008 Than Ngo 4.4.2-1 +- 4.4.2 + +* Mon Sep 08 2008 Rex Dieter - 4.4.1-3 +- apply QMAKEPATH portion of multilib patch only if needed +- qt-copy-patches-20080908 + * Wed Aug 06 2008 Than Ngo - 4.4.1-2 - fix license tag - fix Obsoletes: qt-sqlite (missing epoch) diff --git a/sources b/sources index db1c566..359ce5e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png 6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png -a94a6f5ef01598bb9980891f2515ff45 qt-x11-opensource-src-4.4.1.tar.bz2 -21597a6486886398a7b771d240ad346b qt-copy-patches-20080805svn.tar.bz2 +200faca22f861cd09f108df9924f195c qt-x11-opensource-src-4.4.2.tar.bz2 +d77a7d864375b44b3e9dd3afa53017fa qt-copy-patches-20080920svn.tar.bz2