From 3e7013fc87dc9c1a47c25fa12a8e5d04f1c3e111 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Jun 2011 09:45:01 -0500 Subject: [PATCH] fontconfig patch respin (#705347, QTBUG-19947) --- ...-1.patch => QTBUG-19947-fontconfig-2.patch | 31 +++++++++++++++---- qt.spec | 9 ++++-- 2 files changed, 31 insertions(+), 9 deletions(-) rename QTBUG-19947-fontconfig-1.patch => QTBUG-19947-fontconfig-2.patch (91%) diff --git a/QTBUG-19947-fontconfig-1.patch b/QTBUG-19947-fontconfig-2.patch similarity index 91% rename from QTBUG-19947-fontconfig-1.patch rename to QTBUG-19947-fontconfig-2.patch index 43f09ec..6c258da 100644 --- a/QTBUG-19947-fontconfig-1.patch +++ b/QTBUG-19947-fontconfig-2.patch @@ -1,4 +1,4 @@ -From d9f1c15f10e1a1d076ea4810e708a4c5419b73d2 Mon Sep 17 00:00:00 2001 +From 589a94ddb30499b0f3ecaf909a5b291d64d02dc7 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Mon, 20 Jun 2011 13:47:01 +0200 Subject: [PATCH] Fix fontconfig usage in X11 font database @@ -27,8 +27,8 @@ Task-number: QTBUG-2148, QTBUG-19947 Reviewed-by: Eskil --- src/gui/text/qfontdatabase_x11.cpp | 55 +++++++++++++++--------------------- - src/gui/text/qfontengine_x11.cpp | 22 ++++---------- - 2 files changed, 29 insertions(+), 48 deletions(-) + src/gui/text/qfontengine_x11.cpp | 28 +++++------------- + 2 files changed, 31 insertions(+), 52 deletions(-) diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 754334c..958daa2 100644 @@ -143,7 +143,7 @@ index 754334c..958daa2 100644 return fe; } diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp -index e3bfa5d..74c0130 100644 +index e3bfa5d..490866c 100644 --- a/src/gui/text/qfontengine_x11.cpp +++ b/src/gui/text/qfontengine_x11.cpp @@ -863,11 +863,8 @@ glyph_t QFontEngineXLFD::glyphIndexToFreetypeGlyphIndex(glyph_t g) const @@ -180,7 +180,7 @@ index e3bfa5d..74c0130 100644 extern QFontDef qt_FcPatternToQFontDef(FcPattern *pattern, const QFontDef &); extern FcFontSet *qt_fontSetForPattern(FcPattern *pattern, const QFontDef &request); -@@ -940,22 +935,17 @@ void QFontEngineMultiFT::loadEngine(int at) +@@ -940,22 +935,18 @@ void QFontEngineMultiFT::loadEngine(int at) Q_ASSERT(at < engines.size()); Q_ASSERT(engines.at(at) == 0); @@ -203,9 +203,28 @@ index e3bfa5d..74c0130 100644 QFontCache::instance()->insertEngine(key, fontEngine); } - FcPatternDestroy(pattern); ++ FcPatternDestroy(match); fontEngine->ref.ref(); engines[at] = fontEngine; } +@@ -1123,17 +1114,14 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int s + } + #endif + +- if (!init(face_id, antialias, defaultFormat)) { +- FcPatternDestroy(pattern); ++ if (!init(face_id, antialias, defaultFormat)) + return; +- } + + if (!freetype->charset) { + FcCharSet *cs; + FcPatternGetCharSet (pattern, FC_CHARSET, 0, &cs); + freetype->charset = FcCharSetCopy(cs); + } +- FcPatternDestroy(pattern); + } + + QFontEngineX11FT::~QFontEngineX11FT() -- 1.7.4.1 - diff --git a/qt.spec b/qt.spec index d61e2d7..0287da4 100644 --- a/qt.spec +++ b/qt.spec @@ -18,7 +18,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.7.3 -Release: 5%{?dist} +Release: 6%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -98,7 +98,7 @@ Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch # Fix QNetworkConfigurationManager crash due to null private pointer. (QTBUG-17305, rhbz#682656) Patch106: http://qt.gitorious.org/qt/qt/commit/4d3b9aa83cf7f6d9f9b88d9936e5980629daac2a.patch # bz#705348, per-font autohint fontconfig directives globally disable the bytecode interpreter -Patch107: QTBUG-19947-fontconfig-1.patch +Patch107: QTBUG-19947-fontconfig-2.patch # kde-qt git patches Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch @@ -516,7 +516,7 @@ Qt libraries used for drawing widgets and OpenGL items. # upstream patches %patch105 -p1 -b .webkit_debug_javascriptcore %patch106 -p1 -b .QNetworkConfigurationManager-null-pointer -%patch107 -p1 -b .QTBUG-19947-fontconfig-1 +%patch107 -p1 -b .QTBUG-19947-fontconfig-2 # kde-qt branch @@ -1246,6 +1246,9 @@ fi %changelog +* Mon Jun 20 2011 Rex Dieter 1:4.7.3-6 +- fontconfig patch respin (#705347, QTBUG-19947) + * Mon Jun 20 2011 Rex Dieter 1:4.7.3-5 - updated fontconfig patch (#705347, QTBUG-19947)