mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Update to 3.3.2
This commit is contained in:
parent
6c992223ae
commit
20ca5f3b30
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109250
@ -7,7 +7,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qt-${DB}-plugin
|
||||
PORTVERSION= 3.3.1
|
||||
PORTVERSION= 3.3.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
|
@ -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
|
||||
|
@ -7,7 +7,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qt-${DB}-plugin
|
||||
PORTVERSION= 3.3.1
|
||||
PORTVERSION= 3.3.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
|
@ -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
|
||||
|
@ -7,7 +7,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qt-${DB}-plugin
|
||||
PORTVERSION= 3.3.1
|
||||
PORTVERSION= 3.3.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
|
@ -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
|
||||
|
@ -7,7 +7,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qt-${DB}-plugin
|
||||
PORTVERSION= 3.3.1
|
||||
PORTVERSION= 3.3.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
|
@ -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
|
||||
|
@ -7,7 +7,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qt-${DB}-plugin
|
||||
PORTVERSION= 3.3.1
|
||||
PORTVERSION= 3.3.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
|
||||
ftp://ftp.silug.org/pub/qt/ \
|
||||
|
@ -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
|
||||
|
@ -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/ \
|
||||
|
@ -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
|
||||
|
@ -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
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user