[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-3-1-ga9a6377

[Fathi Boudra]

The following commit has been merged in the master branch:
commit a9a63773b8f623bb1d81cce1a2062c35a5750ea3
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jun 25 21:28:35 2011 +0300

    Update Fix_fontconfig_usage_in_X11_font_database.patch
---
 debian/changelog                                   |    6 ++++
 ...Fix_fontconfig_usage_in_X11_font_database.patch |   26 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a360297..0c286e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.7.3-4) UNRELEASED; urgency=low
+
+  * Update Fix_fontconfig_usage_in_X11_font_database.patch
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 25 Jun 2011 21:22:37 +0300
+
 qt4-x11 (4:4.7.3-3) unstable; urgency=low
 
   [ Fathi Boudra ]
diff --git a/debian/patches/Fix_fontconfig_usage_in_X11_font_database.patch b/debian/patches/Fix_fontconfig_usage_in_X11_font_database.patch
index 11de619..b1d7eb3 100644
--- a/debian/patches/Fix_fontconfig_usage_in_X11_font_database.patch
+++ b/debian/patches/Fix_fontconfig_usage_in_X11_font_database.patch
@@ -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(-)
 
 --- a/src/gui/text/qfontdatabase_x11.cpp
 +++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -176,7 +176,7 @@ Reviewed-by: Eskil
      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
+@@ -940,22 +935,18 @@ void QFontEngineMultiFT::loadEngine(int
      Q_ASSERT(at < engines.size());
      Q_ASSERT(engines.at(at) == 0);
  
@@ -199,6 +199,26 @@ Reviewed-by: Eskil
          QFontCache::instance()->insertEngine(key, fontEngine);
      }
 -    FcPatternDestroy(pattern);
++    FcPatternDestroy(match);
      fontEngine->ref.ref();
      engines[at] = fontEngine;
  }
+@@ -1109,17 +1100,14 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat
+     }
+ #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()

-- 
Qt 4 packaging