aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/qt-ibase-plugin/Makefile2
-rw-r--r--databases/qt-ibase-plugin/distinfo4
-rw-r--r--databases/qt-mysql-plugin/Makefile2
-rw-r--r--databases/qt-mysql-plugin/distinfo4
-rw-r--r--databases/qt-odbc-plugin/Makefile2
-rw-r--r--databases/qt-odbc-plugin/distinfo4
-rw-r--r--databases/qt-pgsql-plugin/Makefile2
-rw-r--r--databases/qt-pgsql-plugin/distinfo4
-rw-r--r--databases/qt-sqlite-plugin/Makefile2
-rw-r--r--databases/qt-sqlite-plugin/distinfo4
-rw-r--r--x11-toolkits/qt33/Makefile3
-rw-r--r--x11-toolkits/qt33/distinfo4
-rw-r--r--x11-toolkits/qt33/files/patch-src-kernel-qfontdatabase_x11.cpp27
-rw-r--r--x11-toolkits/qt33/pkg-plist4
14 files changed, 20 insertions, 48 deletions
diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index 5d795c0e2590..ff171f62f049 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -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/ \
diff --git a/databases/qt-ibase-plugin/distinfo b/databases/qt-ibase-plugin/distinfo
index 4de0a153a14c..b90abcca2a8d 100644
--- a/databases/qt-ibase-plugin/distinfo
+++ b/databases/qt-ibase-plugin/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/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index 5fd5d0358f59..6f68f5d27004 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -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/ \
diff --git a/databases/qt-mysql-plugin/distinfo b/databases/qt-mysql-plugin/distinfo
index 4de0a153a14c..b90abcca2a8d 100644
--- a/databases/qt-mysql-plugin/distinfo
+++ b/databases/qt-mysql-plugin/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/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index b137074e6d12..081ebf5a6de7 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -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/ \
diff --git a/databases/qt-odbc-plugin/distinfo b/databases/qt-odbc-plugin/distinfo
index 4de0a153a14c..b90abcca2a8d 100644
--- a/databases/qt-odbc-plugin/distinfo
+++ b/databases/qt-odbc-plugin/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/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index 835ad9cf1aec..8cc28ec0236e 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -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/ \
diff --git a/databases/qt-pgsql-plugin/distinfo b/databases/qt-pgsql-plugin/distinfo
index 4de0a153a14c..b90abcca2a8d 100644
--- a/databases/qt-pgsql-plugin/distinfo
+++ b/databases/qt-pgsql-plugin/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/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 0cef18b57d24..516d27a00437 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -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/ \
diff --git a/databases/qt-sqlite-plugin/distinfo b/databases/qt-sqlite-plugin/distinfo
index 4de0a153a14c..b90abcca2a8d 100644
--- a/databases/qt-sqlite-plugin/distinfo
+++ b/databases/qt-sqlite-plugin/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/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 03:54:03 +0000