diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-05-16 12:42:24 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-05-16 12:42:24 +0000 |
| commit | 20ca5f3b30a45af262296b5d04dea3cf33375821 (patch) | |
| tree | fa0f6a336de971ff16e7245e55735bc537d0fac2 /x11-toolkits/qt33 | |
| parent | 6c992223ae7790c5335bb1bb0e2a436f1a1c01b9 (diff) | |
| download | ports-20ca5f3b30a45af262296b5d04dea3cf33375821.tar.gz ports-20ca5f3b30a45af262296b5d04dea3cf33375821.zip | |
Notes
Diffstat (limited to 'x11-toolkits/qt33')
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/qt33/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-src-kernel-qfontdatabase_x11.cpp | 27 | ||||
| -rw-r--r-- | x11-toolkits/qt33/pkg-plist | 4 |
4 files changed, 5 insertions, 33 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 786d8e796c1d..7a55e576c915 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -7,8 +7,7 @@ # PORTNAME= qt -PORTVERSION= 3.3.1 -PORTREVISION= 1 +PORTVERSION= 3.3.2 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo index 4de0a153a14c..b90abcca2a8d 100644 --- a/x11-toolkits/qt33/distinfo +++ b/x11-toolkits/qt33/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432 -SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600 +MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c +SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821 diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qfontdatabase_x11.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qfontdatabase_x11.cpp deleted file mode 100644 index b58f36156fad..000000000000 --- a/x11-toolkits/qt33/files/patch-src-kernel-qfontdatabase_x11.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/kernel/qfontdatabase_x11.cpp 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-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist index 58888125ffc4..90bc4f030f44 100644 --- a/x11-toolkits/qt33/pkg-plist +++ b/x11-toolkits/qt33/pkg-plist @@ -415,7 +415,7 @@ lib/libqt-mt.prl lib/libqt-mt.so lib/libqt-mt.so.3 lib/libqt-mt.so.3.3 -lib/libqt-mt.so.3.3.1 +lib/libqt-mt.so.3.3.2 lib/libqui.prl lib/libqui.so lib/libqui.so.1 @@ -2392,5 +2392,5 @@ translations/qt_sk.qm @dirrm share/doc/qt @dirrm lib/plugins/designer @dirrm lib/plugins -@unexec rmdir %D/lib/pkgconfig +@dirrm lib/pkgconfig @dirrm include/private |