[qt] respin qt/fontconfig patch

[Rex Dieter]

commit 07d2a83a45bc3b93f13aa297ae76ee90bff8a3e4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jun 21 09:48:37 2011 -0500

    respin qt/fontconfig patch

 ...onfig-1.patch => QTBUG-19947-fontconfig-2.patch |   31 ++++++++++++++++----
 qt.spec                                            |    6 ++--
 2 files changed, 28 insertions(+), 9 deletions(-)
---
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 <jiang.jiang at nokia.com>
 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 88a00fe..9a61e19 100644
--- a/qt.spec
+++ b/qt.spec
@@ -86,7 +86,7 @@ Patch66: qt-everywhere-opensource-src-4.8.0-tp-openssl.patch
 # UPSTREAM ME
 Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.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
@@ -456,7 +456,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 
 # upstream patches
 %patch105 -p1 -b .webkit_debug_javascriptcore
-%patch107 -p1 -b .QTBUG-19947-fontconfig-1
+%patch107 -p1 -b .QTBUG-19947-fontconfig-2
 
 # kde-qt branch
 %if 0%{?kde_qt}
@@ -1135,7 +1135,7 @@ fi
 
 
 %changelog
-* Mon Jun 20 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-0.2.tp
+* Tue Jun 21 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.0-0.2.tp
 - fontconfig patch (#705347, QTBUG-19947)
 
 * Wed May 25 2011 Jaroslav Reznik <jreznik at redhat.com> 1:4.8.0-0.1.tp