rpms/qt4/devel 0154-qdbuscpp2xml-moc_path.diff, NONE, 1.1 qconfig-multilib.h, 1.1, 1.2 qt4.spec, 1.32, 1.33 qt-x11-opensource-src-4.2.2-extern_c.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5234

Modified Files:
	qconfig-multilib.h qt4.spec 
Added Files:
	0154-qdbuscpp2xml-moc_path.diff 
Removed Files:
	qt-x11-opensource-src-4.2.2-extern_c.patch 
Log Message:
* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-7
- fixup qconfig-multilib.h for powerpc/powerpc64 (#223663)
- include qt-copy's 0154-qdbuscpp2xml-moc_path.diff (#230875)


0154-qdbuscpp2xml-moc_path.diff:

--- NEW FILE 0154-qdbuscpp2xml-moc_path.diff ---
qt-bugs@ issue: none
Trolltech task ID: none
applied: yes
author: Thiago Macieira

qdbuscpp2xml invokes moc in order to do the C++ parsing. But it used
to assume moc was in $PATH, which is not always the case. This patch
makes it use the moc that is in the same bindir as argv[0], falling
back to $PATH if qdbuscpp2xml was also invoked with it.

Note: this does NOT solve the problem of having Qt3's moc ahead in
$PATH if qdbuscpp2xml is also invoked using $PATH.

=== tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
==================================================================
--- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	(revision 167)
+++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	(local)
@@ -351,10 +351,20 @@
     QCoreApplication app(argc, argv);
     QStringList args = app.arguments();
 
+    QString mocExecutable = QFile::encodeName(argv[0]);
+    int i = mocExecutable.lastIndexOf(QLatin1Char('/'));
+    if (i == -1) {
+        // we were called with a relative path
+        mocExecutable = QLatin1String("moc");
+    } else {
+        mocExecutable.truncate(i + 1);
+        mocExecutable.append(QLatin1String("moc"));
+    }
+
     MocParser parser;
     parseCmdLine(args);
 
-    for (int i = 1; i < args.count(); ++i) {
+    for (i = 1; i < args.count(); ++i) {
         const QString arg = args.at(i);
         if (arg.startsWith(QLatin1Char('-')))
             continue;
@@ -375,7 +385,7 @@
         else {
             // run moc on this file
             QProcess proc;
-            proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i]));
+            proc.start(mocExecutable, QStringList() << QFile::decodeName(argv[i]));
 
             if (!proc.waitForStarted()) {
                 fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");


Index: qconfig-multilib.h
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qconfig-multilib.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qconfig-multilib.h	28 Feb 2007 17:28:01 -0000	1.1
+++ qconfig-multilib.h	5 Mar 2007 14:13:05 -0000	1.2
@@ -5,9 +5,9 @@
 # include <QtCore/qconfig-x86_64.h>
 #elif defined(__i386__)
 # include <QtCore/qconfig-i386.h>
-#elif defined(__ppc64__)
+#elif defined(__ppc64__) || defined(__powerpc64__)
 # include <QtCore/qconfig-ppc64.h>
-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
 # include <QtCore/qconfig-ppc.h>
 #elif defined(__sparc__)
 # include <QtCore/qconfig-sparc.h>


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- qt4.spec	28 Feb 2007 19:20:46 -0000	1.32
+++ qt4.spec	5 Mar 2007 14:13:05 -0000	1.33
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -33,8 +33,8 @@
 Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
-# hack to work around (hopefully) temporary Xrandr.h buglet
-Patch3: qt-x11-opensource-src-4.2.2-extern_c.patch
+## qt-copy patches
+Patch0154: 0154-qdbuscpp2xml-moc_path.diff
 
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
@@ -217,7 +217,7 @@
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
-%patch3 -p1 -b .extern_c
+%patch0154 -p0 -b .qt-copy#0154
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -542,8 +542,9 @@
 
 
 %changelog
-* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-6
-- patch around (hopefully) temporary Xrandr.h buglet
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-7
+- fixup qconfig-multilib.h for powerpc/powerpc64 (#223663)
+- include qt-copy's 0154-qdbuscpp2xml-moc_path.diff (#230875)
 
 * Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5
 - fixup qconfig-multilib.h (#223663)


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