rpms/qt/devel qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch, NONE, 1.1 qt-x11-opensource-src-4.2.2-multilib-optflags.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 qt.spec, 1.207, 1.208 sources, 1.38, 1.39 qt-x11-opensource-src-4.2.2-multilib.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Mon Sep 8 16:13:30 UTC 2008 

Author: rdieter

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

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch 
	qt-x11-opensource-src-4.2.2-multilib-optflags.patch 
Removed Files:
	qt-x11-opensource-src-4.2.2-multilib.patch 
Log Message:
* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
- apply QMAKEPATH portion of multilib patch only if needed
- qt-copy-patches-20080908


qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch ---
--- 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;
 }

qt-x11-opensource-src-4.2.2-multilib-optflags.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib-optflags.patch ---
--- 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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	6 Aug 2008 13:16:13 -0000	1.37
+++ .cvsignore	8 Sep 2008 16:12:59 -0000	1.38
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080805svn.tar.bz2
+qt-copy-patches-20080908svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- qt.spec	6 Aug 2008 13:10:37 -0000	1.207
+++ qt.spec	8 Sep 2008 16:12:59 -0000	1.208
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -30,7 +30,8 @@
 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
@@ -40,7 +41,7 @@
 Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080805
+%define qt_copy 20080908
 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,12 +270,19 @@
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy:1}
+# Mac(?)-specific, doesn't apply
+echo "0242" >> patches/DISABLED
+# already(?) applied to 4.4.1
+echo "0244" >> 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
@@ -726,6 +734,10 @@
 
 
 %changelog
+* Mon Sep 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.4.1-3
+- apply QMAKEPATH portion of multilib patch only if needed
+- qt-copy-patches-20080908
+
 * Wed Aug 06 2008 Than Ngo <than at redhat.com> -  4.4.1-2
 - fix license tag
 - fix Obsoletes: qt-sqlite (missing epoch)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	5 Aug 2008 13:16:19 -0000	1.38
+++ sources	8 Sep 2008 16:12:59 -0000	1.39
@@ -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
+ab07c997ab770a4b2c5f8838b7fb4a0e  qt-copy-patches-20080908svn.tar.bz2


--- qt-x11-opensource-src-4.2.2-multilib.patch DELETED ---

More information about the fedora-extras-commits mailing list