From 300626bc4e5ae0d84f0c9cc5a8c4388c272e1775 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 12 Jan 2009 20:15:44 +0000 Subject: [PATCH] - 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 --- ...nsource-src-4.3.4-no-hardcoded-font-aliases.patch | 12 ------------ qt.spec | 9 +++++---- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch 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 f729558..2d57219 100644 --- a/qt.spec +++ b/qt.spec @@ -9,7 +9,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.4.3 -Release: 9%{?dist} +Release: 10%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 with exceptions or GPLv2 with exceptions @@ -33,8 +33,6 @@ 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 @@ -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,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Mon Jan 12 2009 Rex Dieter - 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 - 4.4.3-9 - qt-copy-patches-20090112