rpms/qt/F-9 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch, NONE, 1.1 qt.spec, 1.170, 1.171

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 
Log Message:
* Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-14
- don't hardcode incorrect font substitutions (#447298)

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",


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- qt.spec	18 May 2008 14:17:34 -0000	1.170
+++ qt.spec	19 May 2008 13:56:01 -0000	1.171
@@ -8,7 +8,7 @@
 Name:    qt4
 %endif
 Version: 4.3.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -41,6 +41,8 @@
 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
@@ -288,12 +290,13 @@
 %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
 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'`
@@ -709,6 +712,9 @@
 
 
 %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