rpms/qt/F-9 qt4-sparc64-qvector.patch,NONE,1.1 qt.spec,1.168,1.169

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	qt.spec 
Added Files:
	qt4-sparc64-qvector.patch 
Log Message:
fix sparc64 compile

qt4-sparc64-qvector.patch:

--- NEW FILE qt4-sparc64-qvector.patch ---
diff -up qt-x11-opensource-src-4.3.4/src/corelib/tools/qvector.h.BAD qt-x11-opensource-src-4.3.4/src/corelib/tools/qvector.h
--- qt-x11-opensource-src-4.3.4/src/corelib/tools/qvector.h.BAD	2008-05-17 21:05:34.000000000 -0400
+++ qt-x11-opensource-src-4.3.4/src/corelib/tools/qvector.h	2008-05-17 21:05:55.000000000 -0400
@@ -65,7 +65,7 @@ struct Q_CORE_EXPORT QVectorData
     QBasicAtomic ref;
     int alloc;
     int size;
-#if defined(Q_OS_SOLARIS) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
+#if defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
     // workaround for bug in gcc 3.4.2
     uint sharable;
     uint capacity;
@@ -85,7 +85,7 @@ struct QVectorTypedData
     QBasicAtomic ref;
     int alloc;
     int size;
-#if defined(Q_OS_SOLARIS) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
+#if defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
     // workaround for bug in gcc 3.4.2
     uint sharable;
     uint capacity;


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- qt.spec	8 Apr 2008 01:39:28 -0000	1.168
+++ qt.spec	18 May 2008 03:35:46 -0000	1.169
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -39,6 +39,8 @@
 Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch
 # look for OpenSSL using versioned sonames
 Patch6: qt-x11-opensource-src-4.3.4-openssl.patch
+# Fix sparc64 compile
+Patch7: qt4-sparc64-qvector.patch
 
 ## qt-copy patches
 %define qt_copy 20080305
@@ -286,6 +288,7 @@
 %patch4 -p1
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch6 -p1 -b .openssl
+%patch7 -p1 -b .sparc64
 # SHLIB_VERSION_NUMBER is wrong on F8 and older
 # 0.9.8b is the version in both F7 and F8
 %if 0%{?fedora} < 9
@@ -706,6 +709,10 @@
 
 
 %changelog
+* Sat May 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.3.4-12
+- fix sparc64 compile, the 64bit sparc conditional in src/corelib/tools/qvector.h 
+  applies to linux as well as solaris
+
 * Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-11
 - updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute