rpms/qt4/F-7 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch, NONE, 1.1 qt4-sparc64-qvector.patch, NONE, 1.1 qt4.spec, 1.54, 1.55

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13684/F-7

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
	qt4-sparc64-qvector.patch 
Log Message:
Sync from qt/F-9:

* Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-14
- don't hardcode incorrect font substitutions (#447298)

* Sun May 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.3.4-13
- fix sparc64 multilib header

* 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

qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch:

--- NEW FILE qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch ---
diff -ur qt-x11-opensource-src-4.3.4/src/gui/text/qfont.cpp qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases/src/gui/text/qfont.cpp
--- qt-x11-opensource-src-4.3.4/src/gui/text/qfont.cpp	2008-02-19 18:47:20.000000000 +0100
+++ qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases/src/gui/text/qfont.cpp	2008-05-19 15:36:46.000000000 +0200
@@ -1433,7 +1433,7 @@
     // default substitutions
     static const char *initTbl[] = {
 
-#if defined(Q_WS_X11)
+#if 0
         "arial",        "helvetica",
         "times new roman", "times",
         "courier new",  "courier",

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(QT_ARCH_SPARC) && 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(QT_ARCH_SPARC) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED)
     // workaround for bug in gcc 3.4.2
     uint sharable;
     uint capacity;


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qt4.spec	16 Apr 2008 15:54:17 -0000	1.54
+++ qt4.spec	19 May 2008 14:37:45 -0000	1.55
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.4
-Release: 11%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -39,6 +39,10 @@
 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
+# kill hardcoded font substitutions (#447298)
+Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
 
 ## qt-copy patches
 %define qt_copy 20080305
@@ -291,6 +295,8 @@
 %if 0%{?fedora} < 9
 sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_symbols.cpp
 %endif
+%patch7 -p1 -b .sparc64
+%patch8 -p1 -b .font-aliases
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -706,6 +712,16 @@
 
 
 %changelog
+* Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-14
+- don't hardcode incorrect font substitutions (#447298)
+
+* Sun May 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.3.4-13
+- fix sparc64 multilib header
+
+* 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