From 63c8b7d903139c9f11cdd126c67d49025b3e11e6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jan 13 2009 20:10:20 +0000
Subject: - drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch

    (#447298), in favor of qt-copy's 0263-fix-fontconfig-handling.diff
Mon Jan 12 2009 Than Ngo <than@redhat.com> - 4.4.3-9
- qt-copy-patches-20090112

---

diff --git a/.cvsignore b/.cvsignore
index 33b7ab1..1d13d73 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20081225svn.tar.bz2
+qt-copy-patches-20090112svn.tar.bz2
diff --git a/qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch b/qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
deleted file mode 100644
index 718a671..0000000
--- a/qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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",
diff --git a/qt.spec b/qt.spec
index 94a2e2d..2d57219 100644
--- a/qt.spec
+++ b/qt.spec
@@ -9,7 +9,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 8%{?dist}
+Release: 10%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -33,15 +33,13 @@ Source5: qconfig-multilib.h
 Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
 Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.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
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20081225 
+%define qt_copy 20090112
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -284,7 +282,6 @@ test -x apply_patches && ./apply_patches
 %patch3 -p1 -b .multilib-QMAKEPATH
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
-%patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
 %patch10 -p1 -b .im
 
@@ -734,6 +731,13 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.4.3-10
+- drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
+  in favor of qt-copy's 0263-fix-fontconfig-handling.diff
+
+* Mon Jan 12 2009 Than Ngo <than@redhat.com> - 4.4.3-9
+- qt-copy-patches-20090112
+
 * Tue Dec 30 2008 Rex Dieter <rdieter@fedoraproject.org> 4.4.3-8
 - qt-copy-patches-20081225
 
diff --git a/sources b/sources
index d9ec91f..12f36dc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-00cd44f34d1e4840805ae71a20b378a4  qt-copy-patches-20081225svn.tar.bz2
+9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2