Add a patch which fixes font issues -> from Trolltech.

5 files changed, 42 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 2f72262f0e87..9d6e4059b323 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.130 2004/03/01 13:01:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.131 2004/03/06 13:10:12 caleb Exp $
+
+*qt-3.3.1-r1 (06 Mar 2004)
+
+  06 Mar 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.1-r1.ebuild,
+  files/qfontdatabase_x11.diff:
+  Add a patch which fixes many font problems for users.
+  Patch is from Trolltech, and will be in 3.3.2
 
 *qt-3.3.1 (01 Mar 2004)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f2c597029b1c..1ee8be16fa55 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -2,15 +2,14 @@ MD5 4c52c470dbcf7ed6110bb468b8783782 qt-3.3.0-r1.ebuild 5006
 MD5 9e84006a240b69c02e0aa8b957d48662 qt-3.1.2-r3.ebuild 4984
 MD5 15cb67cf0a0a71f8c86c4aa91714360c qt-2.3.2-r1.ebuild 2285
 MD5 913367613ee452605a107179d5fa1c76 qt-3.0.5-r2.ebuild 3907
-MD5 5a069a91d4b9b2d201a54e5ed81a602e qt-3.3.1.ebuild 4653
+MD5 db94e1832817f9edc3955f3852e0578d qt-3.3.1-r1.ebuild 4700
 MD5 8ba2f35348af78eaa4cf70cdfef1ba01 qt-3.1.2-r4.ebuild 5347
-MD5 bb006a916c7dd84d2001dac694f50ddd ChangeLog 22623
+MD5 4f00e80ee89b35a5e6e13c5adfe4a6af ChangeLog 22855
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 d907d7db29c7ee85e7dd567ea289d732 qt-3.2.3-r1.ebuild 5105
 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1 72
 MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
 MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
@@ -20,9 +19,11 @@ MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 c585d6ad02168e4645ea5ca46d237e1c files/digest-qt-3.3.0-r1 72
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r1 72
 MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
 MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
 MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
diff --git a/x11-libs/qt/files/digest-qt-3.3.1 b/x11-libs/qt/files/digest-qt-3.3.1-r1
index 68146f1a0e7f..68146f1a0e7f 100644
--- a/x11-libs/qt/files/digest-qt-3.3.1
+++ b/x11-libs/qt/files/digest-qt-3.3.1-r1
diff --git a/x11-libs/qt/files/qfontdatabase_x11.diff b/x11-libs/qt/files/qfontdatabase_x11.diff
new file mode 100644
index 000000000000..6a19825d2a5a
--- /dev/null
+++ b/x11-libs/qt/files/qfontdatabase_x11.diff
@@ -0,0 +1,27 @@
+--- src/kernel/qfontdatabsae_x11.cpp.orig	2004-03-04 17:53:01.000000000 +0100
++++ src/kernel/qfontdatabase_x11.cpp	2004-03-04 17:47:59.000000000 +0100
+@@ -1508,6 +1516,24 @@
+ 	XftResult res;
+ 	XftPattern *result =
+ 	    XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res );
++#ifdef QT_XFT2
++	if (script == QFont::Latin) {
++	    // since we added the Euro char on top, check we actually got the family
++	    // we requested. If we didn't get it correctly, remove the Euro from the pattern
++	    // and try again.
++	    FcChar8 *f;
++	    res = FcPatternGetString(result, FC_FAMILY, 0, &f);
++	    if (res == FcResultMatch && QString::fromUtf8((char *)f) != family->rawName) {
++		qDebug("trying without Euro");
++		FcPatternDel(pattern, FC_CHARSET);
++		FcCharSet *cs = FcCharSetCreate();
++		QChar sample = sampleCharacter(script);
++		FcCharSetAddChar(cs, sample.unicode());
++		FcPatternAddCharSet(pattern, FC_CHARSET, cs);
++		result = XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res );
++	    }
++	}
++#endif
+ 	XftPatternDestroy(pattern);
+ 
+ 	// We pass a duplicate to XftFontOpenPattern because either xft font
diff --git a/x11-libs/qt/qt-3.3.1.ebuild b/x11-libs/qt/qt-3.3.1-r1.ebuild
index dd956b094850..8492e6956b6d 100644
--- a/x11-libs/qt/qt-3.3.1.ebuild
+++ b/x11-libs/qt/qt-3.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1.ebuild,v 1.1 2004/03/01 13:01:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r1.ebuild,v 1.1 2004/03/06 13:10:12 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -47,6 +47,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/qt-no-rpath-uic.patch
 
+	epatch ${FILESDIR}/qfontdatabase_x11.diff
+
 #	use icc && export PLATFORM=linux-icc
 }