rpms/qt/devel qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch, NONE, 1.1 qt.spec, 1.181, 1.182

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5249/devel

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.4.0-4
- 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/devel/qt.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- qt.spec	16 May 2008 12:35:02 -0000	1.181
+++ qt.spec	19 May 2008 13:54:51 -0000	1.182
@@ -11,7 +11,7 @@
 Name:    qt4
 %endif
 Version: 4.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
@@ -35,6 +35,8 @@
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.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
 
 ## qt-copy patches
 %define qt_copy 20080516
@@ -309,6 +311,7 @@
 # multilib hacks no longer required
 %patch2 -p1
 %patch5 -p1 -b .bz#437440-as_IN-437440
+%patch8 -p1 -b .font-aliases
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -784,6 +787,9 @@
 
 
 %changelog
+* Mon May 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-4
+- don't hardcode incorrect font substitutions (#447298)
+
 * Fri May 16 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-3
 - qt-copy-patches-20080516