diff options
| author | lofi <lofi@FreeBSD.org> | 2008-03-14 01:57:19 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2008-03-14 01:57:19 +0800 |
| commit | b34f1dd1a8102c0f0750f0fe0381495064f9c2be (patch) | |
| tree | 76ba9ea6482e72068c64ec0d1008eb470c9e716f | |
| parent | 7e59b3c8f3364f8e9916c8d219894da2c3941f44 (diff) | |
| download | freebsd-ports-gnome-b34f1dd1a8102c0f0750f0fe0381495064f9c2be.tar.gz freebsd-ports-gnome-b34f1dd1a8102c0f0750f0fe0381495064f9c2be.tar.zst freebsd-ports-gnome-b34f1dd1a8102c0f0750f0fe0381495064f9c2be.zip | |
Update to Qt 4.3.4
88 files changed, 484 insertions, 435 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index ce0687032aa3..ad5343b4bd31 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -66,7 +66,7 @@ QTCGFLIBS?= .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) -QT4_VERSION?= 4.3.1 +QT4_VERSION?= 4.3.4 _QT_COMPONENTS_ALL= accessible assistant assistantclient codecs-cn \ codecs-jp codecs-kr codecs-tw corelib dbus designer \ diff --git a/accessibility/qt4-accessible/distinfo b/accessibility/qt4-accessible/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/accessibility/qt4-accessible/distinfo +++ b/accessibility/qt4-accessible/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/chinese/qt4-codecs-cn/distinfo b/chinese/qt4-codecs-cn/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/chinese/qt4-codecs-cn/distinfo +++ b/chinese/qt4-codecs-cn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/chinese/qt4-codecs-cn/pkg-plist b/chinese/qt4-codecs-cn/pkg-plist index 2f3e3af9bc28..b91938d0c953 100644 --- a/chinese/qt4-codecs-cn/pkg-plist +++ b/chinese/qt4-codecs-cn/pkg-plist @@ -1,5 +1,3 @@ lib/qt4/plugins/codecs/libqcncodecs.so %%DEBUG%%lib/qt4/plugins/codecs/libqcncodecs.so.debug -share/nls/POSIX -share/nls/en_US.US-ASCII @dirrm lib/qt4/plugins/codecs diff --git a/chinese/qt4-codecs-tw/distinfo b/chinese/qt4-codecs-tw/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/chinese/qt4-codecs-tw/distinfo +++ b/chinese/qt4-codecs-tw/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/chinese/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist index abdadc67e0b5..b76841aac540 100644 --- a/chinese/qt4-codecs-tw/pkg-plist +++ b/chinese/qt4-codecs-tw/pkg-plist @@ -1,5 +1,3 @@ lib/qt4/plugins/codecs/libqtwcodecs.so %%DEBUG%%lib/qt4/plugins/codecs/libqtwcodecs.so.debug -share/nls/POSIX -share/nls/en_US.US-ASCII @dirrm lib/qt4/plugins/codecs diff --git a/databases/qt4-ibase-plugin/distinfo b/databases/qt4-ibase-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-ibase-plugin/distinfo +++ b/databases/qt4-ibase-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-mysql-plugin/distinfo b/databases/qt4-mysql-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-mysql-plugin/distinfo +++ b/databases/qt4-mysql-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-odbc-plugin/distinfo b/databases/qt4-odbc-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-odbc-plugin/distinfo +++ b/databases/qt4-odbc-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-pgsql-plugin/distinfo +++ b/databases/qt4-pgsql-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index bc98f436c464..1d9dd9f0c78e 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -60,6 +60,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-sql/distinfo +++ b/databases/qt4-sql/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 6209f8de587e..54c496b96932 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -74,7 +74,7 @@ lib/libQtSql.prl lib/libQtSql.so lib/libQtSql.so.4 lib/libQtSql.so.4.3 -lib/libQtSql.so.4.3.1 -%%DEBUG%%lib/libQtSql.so.4.3.1.debug +lib/libQtSql.so.4.3.4 +%%DEBUG%%lib/libQtSql.so.4.3.4.debug libdata/pkgconfig/QtSql.pc @dirrm include/QtSql diff --git a/databases/qt4-sqlite-plugin/distinfo b/databases/qt4-sqlite-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-sqlite-plugin/distinfo +++ b/databases/qt4-sqlite-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/databases/qt4-sqlite3-plugin/distinfo b/databases/qt4-sqlite3-plugin/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/databases/qt4-sqlite3-plugin/distinfo +++ b/databases/qt4-sqlite3-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index f5b261d5b3da..f8d91c29529c 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -8,7 +8,7 @@ PORTNAME= dbus PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -66,6 +66,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/dbus-qt4/distinfo +++ b/devel/dbus-qt4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index cf277d8dc50a..a2676beaa2c4 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -39,7 +39,7 @@ lib/libQtDBus.prl lib/libQtDBus.so lib/libQtDBus.so.4 lib/libQtDBus.so.4.3 -lib/libQtDBus.so.4.3.1 -%%DEBUG%%lib/libQtDBus.so.4.3.1.debug +lib/libQtDBus.so.4.3.4 +%%DEBUG%%lib/libQtDBus.so.4.3.4.debug libdata/pkgconfig/QtDBus.pc @dirrm include/QtDBus diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qmake4/distinfo +++ b/devel/qmake4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index cb091277603d..b4c4db434efa 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -118,10 +118,10 @@ share/qt4/mkspecs/hpux-g++-64/qmake.conf share/qt4/mkspecs/hpux-g++-64/qplatformdefs.h share/qt4/mkspecs/hpux-g++/qmake.conf share/qt4/mkspecs/hpux-g++/qplatformdefs.h +share/qt4/mkspecs/hpuxi-acc-32/qmake.conf +share/qt4/mkspecs/hpuxi-acc-32/qplatformdefs.h share/qt4/mkspecs/hpuxi-acc-64/qmake.conf share/qt4/mkspecs/hpuxi-acc-64/qplatformdefs.h -share/qt4/mkspecs/hpuxi-acc/qmake.conf -share/qt4/mkspecs/hpuxi-acc/qplatformdefs.h share/qt4/mkspecs/hurd-g++/qmake.conf share/qt4/mkspecs/hurd-g++/qplatformdefs.h share/qt4/mkspecs/irix-cc-64/qmake.conf @@ -223,9 +223,24 @@ share/qt4/mkspecs/unixware-cc/qmake.conf share/qt4/mkspecs/unixware-cc/qplatformdefs.h share/qt4/mkspecs/unixware-g++/qmake.conf share/qt4/mkspecs/unixware-g++/qplatformdefs.h +share/qt4/mkspecs/win32-borland/qmake.conf +share/qt4/mkspecs/win32-borland/qplatformdefs.h share/qt4/mkspecs/win32-g++/qmake.conf share/qt4/mkspecs/win32-g++/qplatformdefs.h +share/qt4/mkspecs/win32-msvc/features/incremental.prf +share/qt4/mkspecs/win32-msvc/features/incremental_off.prf +share/qt4/mkspecs/win32-msvc/qmake.conf +share/qt4/mkspecs/win32-msvc/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2005/qmake.conf +share/qt4/mkspecs/win32-msvc2005/qplatformdefs.h +share/qt4/mkspecs/win32-msvc.net/qmake.conf +share/qt4/mkspecs/win32-msvc.net/qplatformdefs.h +@dirrm share/qt4/mkspecs/win32-msvc.net +@dirrm share/qt4/mkspecs/win32-msvc2005 +@dirrm share/qt4/mkspecs/win32-msvc/features +@dirrm share/qt4/mkspecs/win32-msvc @dirrm share/qt4/mkspecs/win32-g++ +@dirrm share/qt4/mkspecs/win32-borland @dirrm share/qt4/mkspecs/unixware-g++ @dirrm share/qt4/mkspecs/unixware-cc @dirrm share/qt4/mkspecs/tru64-g++ @@ -275,8 +290,8 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h @dirrm share/qt4/mkspecs/irix-cc-64 @dirrm share/qt4/mkspecs/irix-cc @dirrm share/qt4/mkspecs/hurd-g++ +@dirrm share/qt4/mkspecs/hpuxi-acc-32 @dirrm share/qt4/mkspecs/hpuxi-acc-64 -@dirrm share/qt4/mkspecs/hpuxi-acc @dirrm share/qt4/mkspecs/hpux-g++-64 @dirrm share/qt4/mkspecs/hpux-g++ @dirrm share/qt4/mkspecs/hpux-acc-o64 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index b05bb67c85d8..45d05b5b2b71 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -20,7 +20,7 @@ COMMENT= Qt documentation browser USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \ - gui network sql xml doc + gui network sql xml doc dbus QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-assistant/distinfo +++ b/devel/qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-assistant/files/patch-0185-fix-format-strings.diff b/devel/qt4-assistant/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index 43f4e0a9aaec..000000000000 --- a/devel/qt4-assistant/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,55 +0,0 @@ ---- tools/assistant/config.cpp -+++ tools/assistant/config.cpp -@@ -73,12 +73,12 @@ Config *Config::loadConfig(const QString - - QFile file(profileFileName); - if (!file.exists()) { -- qWarning( (QLatin1String("File does not exist: ") + profileFileName).toAscii().constData() ); -+ qWarning( "File does not exist: %s", qPrintable(profileFileName) ); - return 0; - } - DocuParser *parser = DocuParser::createParser( profileFileName ); - if (!parser) { -- qWarning( (QLatin1String("Failed to create parser for file: ") + profileFileName).toAscii().constData() ); -+ qWarning( "Failed to create parser for file: %s", qPrintable(profileFileName) ); - return 0; - } - if (parser->parserVersion() < DocuParser::Qt320) { -@@ -89,7 +89,7 @@ Config *Config::loadConfig(const QString - parser->parse(&file); - config->profil = profileParser->profile(); - if (!config->profil) { -- qWarning( (QLatin1String("Config::loadConfig(), no profile in: ") + profileFileName).toAscii().constData() ); -+ qWarning( "Config::loadConfig(), no profile in: %s", qPrintable(profileFileName) ); - return 0; - } - config->profil->setProfileType(Profile::UserProfile); ---- tools/assistant/index.cpp -+++ tools/assistant/index.cpp -@@ -180,7 +180,7 @@ void Index::parseDocument( const QString - { - QFile file( filename ); - if ( !file.open(QFile::ReadOnly) ) { -- qWarning( (QLatin1String("can not open file ") + filename).toAscii().constData() ); -+ qWarning( "can not open file %s", qPrintable(filename) ); - return; - } - -@@ -352,7 +352,7 @@ QString Index::getDocumentTitle( const Q - - QFile file( fileName ); - if ( !file.open( QFile::ReadOnly ) ) { -- qWarning( (QLatin1String("cannot open file ") + fileName).toAscii().constData() ); -+ qWarning( "cannot open file %s", qPrintable(fileName) ); - return fileName; - } - QTextStream s( &file ); -@@ -474,7 +474,7 @@ bool Index::searchForPattern( const QStr - QString fName = url.toLocalFile(); - QFile file( fName ); - if ( !file.open( QFile::ReadOnly ) ) { -- qWarning( (QLatin1String("cannot open file ") + fName).toAscii().constData() ); -+ qWarning( "cannot open file %s", qPrintable(fName) ); - return false; - } -
\ No newline at end of file diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 2ec4db79b5ad..af1b1dff0e6c 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -8,7 +8,7 @@ PORTNAME= corelib PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -47,6 +47,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${CONFIGURE_WRKSRC} +.include <bsd.port.pre.mk> + pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -62,10 +64,17 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* + ${HEAD} -n 19 ${WRKSRC}/global/qconfig.h > ${WRKDIR}/qconfig.tmp + ${CHMOD} 644 ${WRKSRC}/global/qconfig.h + ${CAT} ${WRKDIR}/qconfig.tmp ${FILESDIR}/qconfig.h.in > ${WRKSRC}/global/qconfig.h +.if ${OSVERSION} >= 700042 + ${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h +.endif post-install: ${MKDIR} ${PREFIX}/lib/qt4/plugins ${TOUCH} ${PREFIX}/lib/qt4/plugins/.keep_me -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-corelib/distinfo +++ b/devel/qt4-corelib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-corelib/files/patch-CVE-2007-4137 b/devel/qt4-corelib/files/patch-CVE-2007-4137 deleted file mode 100644 index e2bbdd06eb5b..000000000000 --- a/devel/qt4-corelib/files/patch-CVE-2007-4137 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/corelib/codecs/qutfcodec.cpp -+++ src/corelib/codecs/qutfcodec.cpp -@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const char *chars, int len, C - - int originalLength = target->length(); - QString &result = *target; -- result.resize(originalLength + len); // worst case -+ result.resize(originalLength + len + 1); // worst case - QChar *qch = result.data() + originalLength; - uchar ch; - int invalid = 0; diff --git a/devel/qt4-corelib/files/qconfig.h.in b/devel/qt4-corelib/files/qconfig.h.in new file mode 100644 index 000000000000..5e17437dbff8 --- /dev/null +++ b/devel/qt4-corelib/files/qconfig.h.in @@ -0,0 +1,42 @@ +#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC) +# undef QT_NO_CLOCK_MONOTONIC +#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC) +# define QT_NO_CLOCK_MONOTONIC +#endif + +#if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS) +# undef QT_NO_EXCEPTIONS +#elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS) +# define QT_NO_EXCEPTIONS +#endif + +#if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) +# undef QT_NO_INOTIFY +#elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY) +# define QT_NO_INOTIFY +#endif + +#if defined(QT_NO_MREMAP) && defined(QT_MREMAP) +# undef QT_NO_MREMAP +#elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP) +# define QT_NO_MREMAP +#endif + +#if defined(QT_NO_NAS) && defined(QT_NAS) +# undef QT_NO_NAS +#elif !defined(QT_NO_NAS) && !defined(QT_NAS) +# define QT_NO_NAS +#endif + +#if defined(QT_NO_SXE) && defined(QT_SXE) +# undef QT_NO_SXE +#elif !defined(QT_NO_SXE) && !defined(QT_SXE) +# define QT_NO_SXE +#endif + +#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) +# undef QT_USE_MATH_H_FLOATS +#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) +# define QT_USE_MATH_H_FLOATS +#endif + diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 9e66e37256fe..e4804565c656 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -418,8 +418,8 @@ lib/libQtCore.prl lib/libQtCore.so lib/libQtCore.so.4 lib/libQtCore.so.4.3 -lib/libQtCore.so.4.3.1 -%%DEBUG%%lib/libQtCore.so.4.3.1.debug +lib/libQtCore.so.4.3.4 +%%DEBUG%%lib/libQtCore.so.4.3.4.debug lib/qt4/plugins/.keep_me libdata/pkgconfig/QtCore.pc @dirrmtry share/qt4 diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index e9810123b3fa..14d5663aac5a 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -59,6 +59,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-designer/distinfo +++ b/devel/qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-designer/files/patch-0185-fix-format-strings.diff b/devel/qt4-designer/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index 289563024d18..000000000000 --- a/devel/qt4-designer/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- tools/designer/src/lib/uilib/formbuilderextra.cpp -+++ tools/designer/src/lib/uilib/formbuilderextra.cpp -@@ -33,9 +33,7 @@ namespace QFormInternal { - #endif - - void uiLibWarning(const QString &message) { -- QString prefixedMessage = QLatin1String("Designer: "); -- prefixedMessage += message; -- qWarning(prefixedMessage.toUtf8().constData()); -+ qWarning("Designer: %s", qPrintable(message)); - } - - QFormBuilderExtra::QFormBuilderExtra() : ---- tools/designer/src/lib/shared/qdesigner_utils.cpp -+++ tools/designer/src/lib/shared/qdesigner_utils.cpp -@@ -40,9 +40,7 @@ namespace qdesigner_internal - { - QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message) - { -- QString prefixedMessage = QLatin1String("Designer: "); -- prefixedMessage += message; -- qWarning(prefixedMessage.toUtf8().constData()); -+ qWarning("Designer: %s", qPrintable(message)); - } - - QString EnumType::id() const
\ No newline at end of file diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index e96b50de47e9..217ea3a8f926 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -86,14 +86,14 @@ lib/libQtDesigner.prl lib/libQtDesigner.so lib/libQtDesigner.so.4 lib/libQtDesigner.so.4.3 -lib/libQtDesigner.so.4.3.1 -%%DEBUG%%lib/libQtDesigner.so.4.3.1.debug +lib/libQtDesigner.so.4.3.4 +%%DEBUG%%lib/libQtDesigner.so.4.3.4.debug lib/libQtDesignerComponents.prl lib/libQtDesignerComponents.so lib/libQtDesignerComponents.so.4 lib/libQtDesignerComponents.so.4.3 -lib/libQtDesignerComponents.so.4.3.1 -%%DEBUG%%lib/libQtDesignerComponents.so.4.3.1.debug +lib/libQtDesignerComponents.so.4.3.4 +%%DEBUG%%lib/libQtDesignerComponents.so.4.3.4.debug lib/libQtUiTools.a lib/libQtUiTools.prl lib/qt4/plugins/designer/libqt3supportwidgets.so diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-libqtassistantclient/distinfo +++ b/devel/qt4-libqtassistantclient/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index 4d47cd362582..03f77e2e4e9d 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -6,7 +6,7 @@ lib/libQtAssistantClient.prl lib/libQtAssistantClient.so lib/libQtAssistantClient.so.4 lib/libQtAssistantClient.so.4.3 -lib/libQtAssistantClient.so.4.3.1 -%%DEBUG%%lib/libQtAssistantClient.so.4.3.1.debug +lib/libQtAssistantClient.so.4.3.4 +%%DEBUG%%lib/libQtAssistantClient.so.4.3.4.debug libdata/pkgconfig/QtAssistantClient.pc @dirrm include/QtAssistant diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-linguist/distinfo +++ b/devel/qt4-linguist/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-makeqpf/distinfo +++ b/devel/qt4-makeqpf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-moc/distinfo +++ b/devel/qt4-moc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist index 8616c3e199fe..690446be106a 100644 --- a/devel/qt4-moc/pkg-plist +++ b/devel/qt4-moc/pkg-plist @@ -1,4 +1,2 @@ bin/moc-qt4 %%DEBUG%%bin/moc-qt4.debug -share/nls/POSIX -share/nls/en_US.US-ASCII diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-porting/distinfo +++ b/devel/qt4-porting/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-qdbusviewer/distinfo +++ b/devel/qt4-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 8f97d711b9ea..79806c2583a2 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -60,6 +60,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-qt3support/distinfo +++ b/devel/qt4-qt3support/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff b/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index d6570f036550..000000000000 --- a/devel/qt4-qt3support/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- src/qt3support/tools/q3gcache.cpp -+++ src/qt3support/tools/q3gcache.cpp -@@ -622,7 +622,7 @@ void Q3GCache::statistics() const - #if defined(QT_DEBUG) - QString line; - line.fill(QLatin1Char('*'), 80); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - qDebug("CACHE STATISTICS:"); - qDebug("cache contains %d item%s, with a total cost of %d", - count(), count() != 1 ? "s" : "", tCost); -@@ -643,7 +643,7 @@ void Q3GCache::statistics() const - lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts); - qDebug("Statistics from internal dictionary class:"); - dict->statistics(); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - #endif - } - ---- src/qt3support/tools/q3gdict.cpp -+++ src/qt3support/tools/q3gdict.cpp -@@ -828,11 +828,11 @@ void Q3GDict::statistics() const - QString line; - line.fill(QLatin1Char('-'), 60); - double real, ideal; -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - qDebug("DICTIONARY STATISTICS:"); - if (count() == 0) { - qDebug("Empty!"); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - return; - } - real = 0.0; -@@ -853,7 +853,7 @@ void Q3GDict::statistics() const - while (b--) - *pbuf++ = '*'; - *pbuf = '\0'; -- qDebug(buf); -+ qDebug("%s", buf); - i++; - } - qDebug("Array size = %d", size()); -@@ -861,7 +861,7 @@ void Q3GDict::statistics() const - qDebug("Real dist = %g", real); - qDebug("Rand dist = %g", ideal); - qDebug("Real/Rand = %g", real/ideal); -- qDebug(line.ascii()); -+ qDebug("%s", line.ascii()); - #endif // QT_DEBUG - } - ---- src/qt3support/tools/q3cstring.h -+++ src/qt3support/tools/q3cstring.h -@@ -57,7 +57,11 @@ public: - } - - Q3CString copy() const { return *this; } -- Q3CString &sprintf(const char *format, ...); -+ Q3CString &sprintf(const char *format, ...) -+#if defined(Q_CC_GNU) && !defined(__INSURE__) -+ __attribute__ ((format (printf, 2, 3))) -+#endif -+ ; - - Q3CString left(uint len) const { return QByteArray::left(len); } - Q3CString right(uint len) const { return QByteArray::right(len); }
\ No newline at end of file diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 7cc317e99397..5c2ae6c25daf 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -406,7 +406,7 @@ lib/libQt3Support.prl lib/libQt3Support.so lib/libQt3Support.so.4 lib/libQt3Support.so.4.3 -lib/libQt3Support.so.4.3.1 -%%DEBUG%%lib/libQt3Support.so.4.3.1.debug +lib/libQt3Support.so.4.3.4 +%%DEBUG%%lib/libQt3Support.so.4.3.4.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/Qt3Support diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 8310ab6651f9..0cb0b16993ac 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -59,6 +59,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-qtestlib/distinfo +++ b/devel/qt4-qtestlib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index 37f5b4c53fc2..f1e190aa38a4 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -32,7 +32,7 @@ lib/libQtTest.prl lib/libQtTest.so lib/libQtTest.so.4 lib/libQtTest.so.4.3 -lib/libQtTest.so.4.3.1 -%%DEBUG%%lib/libQtTest.so.4.3.1.debug +lib/libQtTest.so.4.3.4 +%%DEBUG%%lib/libQtTest.so.4.3.4.debug libdata/pkgconfig/QtTest.pc @dirrm include/QtTest diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-qvfb/distinfo +++ b/devel/qt4-qvfb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-qvfb/files/patch-qwssignalhandler_p.h b/devel/qt4-qvfb/files/patch-qwssignalhandler_p.h deleted file mode 100644 index b427205e2fbd..000000000000 --- a/devel/qt4-qvfb/files/patch-qwssignalhandler_p.h +++ /dev/null @@ -1,11 +0,0 @@ ---- qwssignalhandler_p.h.orig Sun Jan 14 15:52:43 2007 -+++ qwssignalhandler_p.h Sun Jan 14 15:52:57 2007 -@@ -39,6 +39,8 @@ - #include <QtCore/qvector.h> - #include <signal.h> - -+typedef void (*sighandler_t)(int); -+ - class QWSSignalHandler - { - public: diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-rcc/distinfo +++ b/devel/qt4-rcc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-rcc/pkg-plist b/devel/qt4-rcc/pkg-plist index 8787e83f66f2..f17a054adcb1 100644 --- a/devel/qt4-rcc/pkg-plist +++ b/devel/qt4-rcc/pkg-plist @@ -1,4 +1,2 @@ bin/rcc %%DEBUG%%bin/rcc.debug -share/nls/POSIX -share/nls/en_US.US-ASCII diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 7ac82ce3cc17..e7144254426a 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -61,6 +61,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-script/distinfo +++ b/devel/qt4-script/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index d0755529cf2d..f1c5ba44991c 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -27,7 +27,7 @@ lib/libQtScript.prl lib/libQtScript.so lib/libQtScript.so.4 lib/libQtScript.so.4.3 -lib/libQtScript.so.4.3.1 -%%DEBUG%%lib/libQtScript.so.4.3.1.debug +lib/libQtScript.so.4.3.4 +%%DEBUG%%lib/libQtScript.so.4.3.4.debug libdata/pkgconfig/QtScript.pc @dirrm include/QtScript diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-uic/distinfo +++ b/devel/qt4-uic/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist index 3f47b2dec0fc..b5060a2e10a1 100644 --- a/devel/qt4-uic/pkg-plist +++ b/devel/qt4-uic/pkg-plist @@ -1,4 +1,2 @@ bin/uic-qt4 %%DEBUG%%bin/uic-qt4.debug -share/nls/POSIX -share/nls/en_US.US-ASCII diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/devel/qt4-uic3/distinfo +++ b/devel/qt4-uic3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/devel/qt4-uic3/pkg-plist b/devel/qt4-uic3/pkg-plist index 9a743f9e4c42..9d3131c9d188 100644 --- a/devel/qt4-uic3/pkg-plist +++ b/devel/qt4-uic3/pkg-plist @@ -1,4 +1,2 @@ bin/uic3 %%DEBUG%%bin/uic3.debug -share/nls/POSIX -share/nls/en_US.US-ASCII diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure index b59d302adc5f..97ff95c9f0df 100644 --- a/devel/qt4/files/configure +++ b/devel/qt4/files/configure @@ -2,7 +2,7 @@ # # Configures to build the Qt library # -# Copyright (C) 1999-2007 Trolltech ASA. All rights reserved. +# Copyright (C) 1999-2008 Trolltech ASA. All rights reserved. # # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -40,7 +40,7 @@ QT_CONFIG= SUPPORTED= QMAKE_VARS_FILE=.qmake.vars -exec 5> "$QMAKE_VARS_FILE" +:> "$QMAKE_VARS_FILE" #------------------------------------------------------------------------------- # utility functions @@ -66,7 +66,7 @@ QMakeVar() ;; esac - echo >&5 "$2" "$eq" "$3" + echo "$2" "$eq" "$3" >> "$QMAKE_VARS_FILE" } # relies on $QMAKESPEC being set correctly. parses include statements in @@ -162,7 +162,7 @@ if [ -f "$relpath"/LICENSE.Qtopia ]; then Licensee="Qtopia" Edition="Qtopia" QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL ]; then +elif [ -f "$relpath"/LICENSE.QPL -o -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ]; then # Open Source edition - may only be used under the terms of the QPL or GPL. [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes @@ -191,7 +191,7 @@ elif [ -f "$relpath"/LICENSE.SNAPSHOT.COMMERCIAL ]; then Licensee="Snapshot" Edition="Snapshot" QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE ]; then +elif [ -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE.GPL2 -o -f "$relpath"/LICENSE.SNAPSHOT.OPENSOURCE.GPL3 ]; then # snapshot - opensource [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes @@ -420,7 +420,7 @@ else ;; esac if [ '!' -f "$outpath/LICENSE" ]; then - echo "The LICENSE, LICENSE.QPL, or LICENSE.GPL file shipped with" + echo "The LICENSE, LICENSE.QPL, or LICENSE.GPL2 file shipped with" echo "this software has disappeared." echo echo "Sorry, you are not licensed to use this software." @@ -609,6 +609,7 @@ QT_INSTALL_TRANSLATIONS= QT_INSTALL_SETTINGS= QT_INSTALL_EXAMPLES= QT_INSTALL_DEMOS= +QT_HOST_PREFIX= #flags for SQL drivers QT_CFLAGS_PSQL= @@ -763,6 +764,16 @@ while [ "$#" -gt 0 ]; do shift; VAL=$1 fi + ;; + -hostprefix) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + # this option may or may not be followed by an argument + if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then + VAL=$outpath + else + shift; + VAL=$1 + fi ;; -iwmmxt) CFG_IWMMXT="yes" @@ -874,6 +885,9 @@ while [ "$#" -gt 0 ]; do prefix) QT_INSTALL_PREFIX="$VAL" ;; + hostprefix) + QT_HOST_PREFIX="$VAL" + ;; docdir) QT_INSTALL_DOCS="$VAL" ;; @@ -1911,14 +1925,25 @@ if [ -z "$PLATFORM" ]; then " ;; HP-UX:*) - #PLATFORM=hpux-g++ - PLATFORM=hpux-acc - #PLATFORM=hpux-acc-64 - #PLATFORM=hpux-cc - #PLATFORM=hpux-acc-o64 - PLATFORM_NOTES=" - - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 - " + case "$UNAME_MACHINE" in + ia64) + #PLATFORM=hpuxi-acc-32 + PLATFORM=hpuxi-acc-64 + PLATFORM_NOTES=" + - Also available for HP-UXi: hpuxi-acc-32 + " + ;; + *) + #PLATFORM=hpux-g++ + PLATFORM=hpux-acc + #PLATFORM=hpux-acc-64 + #PLATFORM=hpux-cc + #PLATFORM=hpux-acc-o64 + PLATFORM_NOTES=" + - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 + " + ;; + esac ;; OSF1:*) #PLATFORM=tru64-g++ @@ -2002,6 +2027,13 @@ if [ -z "$PLATFORM" ]; then esac fi +if [ "$PLATFORM_QWS" = "yes" ]; then + CFG_SM=no + PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"` +else + PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"` +fi + [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" if [ -d "$PLATFORM" ]; then QMAKESPEC="$PLATFORM" @@ -2248,7 +2280,7 @@ else fi TEST_COMPILER="$CC" -[ -z "$TEST_COMPILE" ] && TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` +[ -z "$TEST_COMPILER" ] && TEST_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` # auto-detect precompiled header support if [ "$CFG_PRECOMPILE" = "auto" ]; then @@ -2586,6 +2618,16 @@ Installation options: -prefix <dir> ...... This will install everything relative to <dir> (default $QT_INSTALL_PREFIX) +EOF +if [ "$PLATFORM_QWS" = "yes" ]; then +cat <<EOF + + -hostprefix [dir] .. Tools and libraries needed when developing + applications are installed in [dir]. If [dir] is + not given, the current build directory will be used. +EOF +fi +cat <<EOF * -prefix-install .... Force a sandboxed "local" installation of Qt. This will install into @@ -2856,13 +2898,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then IMY="*" IMN=" " fi - if [ "$CFG_GLIB" = "no" ]; then - GBY=" " - GBN="+" - else - GBY="+" - GBN=" " - fi cat << EOF Qt/X11 only: @@ -2914,9 +2949,6 @@ Qt/X11 only: $XKN -no-xkb ............ Do not compile XKB (X KeyBoard extension) support. $XKY -xkb ............... Compile XKB support. - $GBN -no-glib............ Do not compile Glib support. - $GBY -glib............... Compile Glib support. - $SBN -no-separate-debug-info Do not store debug information in a separate file $SBY -separate-debug-info Strip debug information into a separate .debug file @@ -3023,6 +3055,25 @@ Qtopia Core only: EOF fi + +if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then + if [ "$CFG_GLIB" = "no" ]; then + GBY=" " + GBN="+" + elif [ "$CFG_GLIB" = "yes" -o "$PLATFORM_X11" = "yes" ]; then + GBY="+" + GBN=" " + else # auto and qtopia core + GBY=" " + GBN="+" + fi + cat << EOF + $GBN -no-glib............ Do not compile Glib support. + $GBY -glib............... Compile Glib support. + +EOF +fi + [ "x$ERROR" = "xyes" ] && exit 1 exit 0 fi # Help @@ -3068,17 +3119,18 @@ elif [ "$Edition" = "OpenSource" ]; then while true; do if [ "$PLATFORM_QWS" = "yes" ]; then echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL)." + echo "the GNU General Public License (GPL) versions 2 or 3." echo affix="the" elif [ "$PLATFORM_MAC" = "yes" ]; then echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL)." + echo "the GNU General Public License (GPL) versions 2 or 3." echo affix="the" elif [ "$PLATFORM_X11" = "yes" ]; then echo "You are licensed to use this software under the terms of either" - echo "the Q Public License (QPL) or the GNU General Public License (GPL)." + echo "the Q Public License (QPL) or the GNU General Public License (GPL)" + echo "versions 2 or 3" echo [ "$OPT_CONFIRM_LICENSE" = "no" ] && echo "Type 'Q' to view the Q Public License." affix="either" @@ -3087,7 +3139,8 @@ elif [ "$Edition" = "OpenSource" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - echo "Type 'G' to view the GNU General Public License." + echo "Type '2' to view the GNU General Public License version 2." + echo "Type '3' to view the GNU General Public License version 3." echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." echo @@ -3105,8 +3158,10 @@ elif [ "$Edition" = "OpenSource" ]; then echo "You are not licensed to use this software." echo exit 1 - elif [ "$acceptance" = "G" -o "$acceptance" = "g" ]; then - more "$relpath/LICENSE.GPL" + elif [ "$acceptance" = "2" ]; then + more "$relpath/LICENSE.GPL2" + elif [ "$acceptance" = "3" ]; then + more "$relpath/LICENSE.GPL3" elif [ "$acceptance" = "Q" -o "$acceptance" = "q" ]; then if [ "$PLATFORM_QWS" != "yes" ]; then more "$relpath/LICENSE.QPL" @@ -3115,12 +3170,20 @@ elif [ "$Edition" = "OpenSource" ]; then done elif [ "$Edition" = "Preview" ]; then while true; do + if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then + TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.OPENSOURCE"` + else + TheLicense=`head -n 1 "$relpath/LICENSE.PREVIEW.COMMERCIAL"` + fi + + TheLicense=`echo $TheLicense | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` + if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else echo "You are licensed to use this software under the terms of" - echo "the Qt PREVIEW VERSION LICENSE AGREEMENT" + echo "the $TheLicense" echo echo "Type '?' to read the Preview License." echo "Type 'yes' to accept this license offer." @@ -3150,14 +3213,24 @@ elif [ "$Edition" = "Preview" ]; then done elif [ "$Edition" = "Snapshot" ]; then while true; do + if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then + TheLicense=`head -n 1 "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2"` + else + TheLicense=`head -n 1 "$relpath/LICENSE.SNAPSHOT.COMMERCIAL"` + fi + + TheLicense=`echo $TheLicense | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` + if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else echo "You are licensed to use this software under the terms of" - echo "the Qt SNAPSHOT VERSION LICENSE AGREEMENT" + echo "the $TheLicense" echo - echo "Type '?' to read the Snapshot License." + test -f "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" && echo "Type '?' to read the Snapshot License." + test -f "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" && echo "Type '2' to view the GNU General Public License version 2." + test -f "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" && echo "Type '3' to view the GNU General Public License version 3." echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." echo @@ -3176,11 +3249,11 @@ elif [ "$Edition" = "Snapshot" ]; then echo exit 0 elif [ "$acceptance" = "?" ]; then - if [ "$QT_EDITION" = "QT_EDITION_OPENSOURCE" ]; then - more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE" - else - more "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" - fi + more "$relpath/LICENSE.SNAPSHOT.COMMERCIAL" + elif [ "$acceptance" = "2" ]; then + more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL2" + elif [ "$acceptance" = "3" ]; then + more "$relpath/LICENSE.SNAPSHOT.OPENSOURCE.GPL3" fi done elif [ "$Edition" != "Trolltech" ]; then @@ -3310,6 +3383,41 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* License Info */ static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR"; static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR"; +EOF + +if [ ! -z "$QT_HOST_PREFIX" ]; then + HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX" "\\0"` + HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc" "\\0"` + HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include" "\\0"` + HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib" "\\0"` + HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin" "\\0"` + HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins" "\\0"` + HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX" "\\0"` + HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations" "\\0"` + HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS" "\\0"` + HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES" "\\0"` + HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS" "\\0"` + + cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF + +#if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE) +/* Installation Info */ +static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR"; +static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR"; +static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR"; +static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR"; +static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR"; +static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR"; +static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR"; +static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR"; +static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR"; +static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR"; +static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR"; +#else // QT_BOOTSTRAPPED +EOF +fi + +cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* Installation Info */ static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR"; static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR"; @@ -3322,6 +3430,16 @@ static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR"; static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR"; static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR"; +EOF + +if [ ! -z "$QT_HOST_PREFIX" ]; then + cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF +#endif // QT_BOOTSTRAPPED + +EOF +fi + +cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* strlen( "qt_lcnsxxxx" ) == 12 */ #define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12; #define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12; @@ -3477,8 +3595,6 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ]; if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DQMAKE_OPENSOURCE_EDITION" - else - echo "include Makefile.commercial" >>"$mkfile" fi if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE @@ -3714,7 +3830,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` - QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` + QT_MYSQL_VERSION=`$CFG_MYSQL_VERSION --version 2>/dev/null` QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` fi if [ -n "$QT_MYSQL_VERSION" ] && [ "$QT_MYSQL_VERSION_MAJOR" -lt 4 ]; then @@ -4214,14 +4330,21 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi fi +fi # X11 + +if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then # auto-detect Glib support + if [ "$PLATFORM_QWS" = "yes" -a "$CFG_GLIB" = "auto" ]; then + CFG_GLIB="no" + fi + if [ "$CFG_GLIB" != "no" ]; then if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pkg-config >/dev/null 2>&1; then QT_CFLAGS_GLIB=`pkg-config --cflags glib-2.0 gthread-2.0` QT_LIBS_GLIB=`pkg-config --libs glib-2.0 gthread-2.0` fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/glib "Glib" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GLIB $QT_LIBS_GLIB $X11TESTS_FLAGS; then CFG_GLIB=yes QMakeVar set QT_CFLAGS_GLIB "$QT_CFLAGS_GLIB" QMakeVar set QT_LIBS_GLIB "$QT_LIBS_GLIB" @@ -4237,7 +4360,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi fi -fi # X11 +fi # X11/QWS # QWS if [ "$PLATFORM_QWS" = "yes" ]; then @@ -4806,7 +4929,8 @@ fi if [ '!' -z "$I_FLAGS" ]; then # add the user define include paths - QMakeVar add INCPATH `echo $I_FLAGS | sed s,-I,,g` + QMakeVar add QMAKE_CFLAGS "$I_FLAGS" + QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS" fi # turn off exceptions for the compilers that support it @@ -4850,15 +4974,15 @@ case "$COMPILER" in g++*) # GNU C++ QMAKE_CONF_COMPILER=`getQMakeConf | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1,"` - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null` + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in - *2.95.*) + 2.95.*) COMPILER_VERSION="2.95.*" ;; - *3.*) + 3.*) COMPILER_VERSION="3.*" ;; - *4.*) + 4.*) COMPILER_VERSION="4" ;; *) diff --git a/graphics/qt4-iconengines/distinfo b/graphics/qt4-iconengines/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/graphics/qt4-iconengines/distinfo +++ b/graphics/qt4-iconengines/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/graphics/qt4-imageformats/distinfo b/graphics/qt4-imageformats/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/graphics/qt4-imageformats/distinfo +++ b/graphics/qt4-imageformats/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/graphics/qt4-pixeltool/distinfo b/graphics/qt4-pixeltool/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/graphics/qt4-pixeltool/distinfo +++ b/graphics/qt4-pixeltool/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index 7dd3a3e403bd..2f2d92b268ae 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -61,6 +61,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/graphics/qt4-svg/distinfo b/graphics/qt4-svg/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/graphics/qt4-svg/distinfo +++ b/graphics/qt4-svg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist index c7f4b8e42584..44406bb5f79e 100644 --- a/graphics/qt4-svg/pkg-plist +++ b/graphics/qt4-svg/pkg-plist @@ -17,7 +17,7 @@ lib/libQtSvg.prl lib/libQtSvg.so lib/libQtSvg.so.4 lib/libQtSvg.so.4.3 -lib/libQtSvg.so.4.3.1 -%%DEBUG%%lib/libQtSvg.so.4.3.1.debug +lib/libQtSvg.so.4.3.4 +%%DEBUG%%lib/libQtSvg.so.4.3.4.debug libdata/pkgconfig/QtSvg.pc @dirrm include/QtSvg diff --git a/japanese/qt4-codecs-jp/distinfo b/japanese/qt4-codecs-jp/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/japanese/qt4-codecs-jp/distinfo +++ b/japanese/qt4-codecs-jp/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/japanese/qt4-codecs-jp/pkg-plist b/japanese/qt4-codecs-jp/pkg-plist index 6339c1158794..94fb35d3b9a3 100644 --- a/japanese/qt4-codecs-jp/pkg-plist +++ b/japanese/qt4-codecs-jp/pkg-plist @@ -1,5 +1,3 @@ lib/qt4/plugins/codecs/libqjpcodecs.so %%DEBUG%%lib/qt4/plugins/codecs/libqjpcodecs.so.debug -share/nls/POSIX -share/nls/en_US.US-ASCII @dirrm lib/qt4/plugins/codecs diff --git a/korean/qt4-codecs-kr/distinfo b/korean/qt4-codecs-kr/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/korean/qt4-codecs-kr/distinfo +++ b/korean/qt4-codecs-kr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/korean/qt4-codecs-kr/pkg-plist b/korean/qt4-codecs-kr/pkg-plist index 3f980e7e44d5..d354ae9aac7d 100644 --- a/korean/qt4-codecs-kr/pkg-plist +++ b/korean/qt4-codecs-kr/pkg-plist @@ -1,5 +1,3 @@ lib/qt4/plugins/codecs/libqkrcodecs.so %%DEBUG%%lib/qt4/plugins/codecs/libqkrcodecs.so.debug -share/nls/POSIX -share/nls/en_US.US-ASCII @dirrm lib/qt4/plugins/codecs diff --git a/misc/qt4-doc/distinfo b/misc/qt4-doc/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/misc/qt4-doc/distinfo +++ b/misc/qt4-doc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist index 9e1b9efd5b93..5cbe817c2860 100644 --- a/misc/qt4-doc/pkg-plist +++ b/misc/qt4-doc/pkg-plist @@ -426,10 +426,12 @@ share/doc/qt4/html/images/bearings.png share/doc/qt4/html/images/blockingfortuneclient-example.png share/doc/qt4/html/images/books-demo.png share/doc/qt4/html/images/borderlayout-example.png +share/doc/qt4/html/images/branchindicatorimage.png share/doc/qt4/html/images/broadcastreceiver-example.png share/doc/qt4/html/images/broadcastsender-example.png share/doc/qt4/html/images/brush-outline.png share/doc/qt4/html/images/brush-styles.png +share/doc/qt4/html/images/button.png share/doc/qt4/html/images/buttonbox-gnomelayout-horizontal.png share/doc/qt4/html/images/buttonbox-gnomelayout-vertical.png share/doc/qt4/html/images/buttonbox-kdelayout-horizontal.png @@ -477,6 +479,8 @@ share/doc/qt4/html/images/cde-treeview.png share/doc/qt4/html/images/charactermap-example.png share/doc/qt4/html/images/chart-example.png share/doc/qt4/html/images/chat-example.png +share/doc/qt4/html/images/checkbox.png +share/doc/qt4/html/images/checkboxexample.png share/doc/qt4/html/images/chip-demo.png share/doc/qt4/html/images/classwizard-flow.png share/doc/qt4/html/images/classwizard.png @@ -511,6 +515,8 @@ share/doc/qt4/html/images/cleanlooks-treeview.png share/doc/qt4/html/images/codecs-example.png share/doc/qt4/html/images/collidingmice-example.png share/doc/qt4/html/images/coloreditorfactoryimage.png +share/doc/qt4/html/images/combobox.png +share/doc/qt4/html/images/comboboximage.png share/doc/qt4/html/images/completer-example-country.png share/doc/qt4/html/images/completer-example-dirmodel.png share/doc/qt4/html/images/completer-example-qdirmodel.png @@ -518,6 +524,7 @@ share/doc/qt4/html/images/completer-example-word.png share/doc/qt4/html/images/completer-example.png share/doc/qt4/html/images/composition-demo.png share/doc/qt4/html/images/concentriccircles-example.png +share/doc/qt4/html/images/conceptualpushbuttontree.png share/doc/qt4/html/images/configdialog-example.png share/doc/qt4/html/images/conicalGradient.png share/doc/qt4/html/images/containerextension-example.png @@ -630,6 +637,8 @@ share/doc/qt4/html/images/dialog-examples.png share/doc/qt4/html/images/digitalclock-example.png share/doc/qt4/html/images/directapproach-calculatorform.png share/doc/qt4/html/images/dirview-example.png +share/doc/qt4/html/images/dockwidget.png +share/doc/qt4/html/images/dockwidgetimage.png share/doc/qt4/html/images/dockwidgets-example.png share/doc/qt4/html/images/dombookmarks-example.png share/doc/qt4/html/images/draganddrop-examples.png @@ -675,6 +684,10 @@ share/doc/qt4/html/images/graphicsview-view.png share/doc/qt4/html/images/graphicsview-zorder.png share/doc/qt4/html/images/gridlayout.png share/doc/qt4/html/images/groupbox-example.png +share/doc/qt4/html/images/groupbox.png +share/doc/qt4/html/images/groupboximage.png +share/doc/qt4/html/images/header.png +share/doc/qt4/html/images/headerimage.png share/doc/qt4/html/images/hellogl-example.png share/doc/qt4/html/images/http-example.png share/doc/qt4/html/images/httpstack.png @@ -708,6 +721,11 @@ share/doc/qt4/html/images/insertrowinmodelview.png share/doc/qt4/html/images/interview-demo.png share/doc/qt4/html/images/interview-shareddirmodel.png share/doc/qt4/html/images/itemview-examples.png +share/doc/qt4/html/images/itemviews-editabletreemodel-indexes.png +share/doc/qt4/html/images/itemviews-editabletreemodel-items.png +share/doc/qt4/html/images/itemviews-editabletreemodel-model.png +share/doc/qt4/html/images/itemviews-editabletreemodel-values.png +share/doc/qt4/html/images/itemviews-editabletreemodel.png share/doc/qt4/html/images/itemviewspuzzle-example.png share/doc/qt4/html/images/javaiterators1.png share/doc/qt4/html/images/javaiterators2.png @@ -798,6 +816,10 @@ share/doc/qt4/html/images/mandelbrot_zoom2.png share/doc/qt4/html/images/mandelbrot_zoom3.png share/doc/qt4/html/images/masterdetail-example.png share/doc/qt4/html/images/mdi-example.png +share/doc/qt4/html/images/menu.png +share/doc/qt4/html/images/menubar.png +share/doc/qt4/html/images/menubarimage.png +share/doc/qt4/html/images/menuimage.png share/doc/qt4/html/images/menus-example.png share/doc/qt4/html/images/modelindex-no-parent.png share/doc/qt4/html/images/modelview-begin-append-columns.png @@ -914,8 +936,11 @@ share/doc/qt4/html/images/portedcanvas-example.png share/doc/qt4/html/images/printer-rects.png share/doc/qt4/html/images/progressBar-stylesheet.png share/doc/qt4/html/images/progressBar2-stylesheet.png +share/doc/qt4/html/images/progressbar.png +share/doc/qt4/html/images/progressbarimage.png share/doc/qt4/html/images/propagation-custom.png share/doc/qt4/html/images/propagation-standard.png +share/doc/qt4/html/images/pushbutton.png share/doc/qt4/html/images/q3painter_rationale.png share/doc/qt4/html/images/qactiongroup-align.png share/doc/qt4/html/images/qcalendarwidget-grid.png @@ -929,6 +954,7 @@ share/doc/qt4/html/images/qcolor-hue.png share/doc/qt4/html/images/qcolor-rgb.png share/doc/qt4/html/images/qcolor-saturation.png share/doc/qt4/html/images/qcolor-value.png +share/doc/qt4/html/images/qcolumnview.png share/doc/qt4/html/images/qconicalgradient.png share/doc/qt4/html/images/qdatawidgetmapper-simple.png share/doc/qt4/html/images/qdesktopwidget.png @@ -1077,7 +1103,9 @@ share/doc/qt4/html/images/qtopiacore-clientservercommunication.png share/doc/qt4/html/images/qtopiacore-drawingonscreen.png share/doc/qt4/html/images/qtopiacore-examples.png share/doc/qt4/html/images/qtopiacore-fontfeatures.png -share/doc/qt4/html/images/qtopiacore-opengl.png +share/doc/qt4/html/images/qtopiacore-opengl1.png +share/doc/qt4/html/images/qtopiacore-opengl2.png +share/doc/qt4/html/images/qtopiacore-opengl3.png share/doc/qt4/html/images/qtopiacore-pda.png share/doc/qt4/html/images/qtopiacore-phone.png share/doc/qt4/html/images/qtopiacore-pointerhandlinglayer.png @@ -1087,7 +1115,6 @@ share/doc/qt4/html/images/qtopiacore-qvfbviewmenu.png share/doc/qt4/html/images/qtopiacore-reserveregion.png share/doc/qt4/html/images/qtopiacore-runningapplication.png share/doc/qt4/html/images/qtopiacore-setwindowattribute.png -share/doc/qt4/html/images/qtopiacore-vanilla.png share/doc/qt4/html/images/qtopiacore-virtualframebuffer.png share/doc/qt4/html/images/qtransform-combinedtransformation.png share/doc/qt4/html/images/qtransform-combinedtransformation2.png @@ -1132,12 +1159,16 @@ share/doc/qt4/html/images/richtext-examples.png share/doc/qt4/html/images/rintersect.png share/doc/qt4/html/images/rsslistingexample.png share/doc/qt4/html/images/rsubtract.png +share/doc/qt4/html/images/rubberband.png +share/doc/qt4/html/images/rubberbandimage.png share/doc/qt4/html/images/runion.png share/doc/qt4/html/images/rxor.png share/doc/qt4/html/images/samplebuffers-example.png share/doc/qt4/html/images/saxbookmarks-example.png share/doc/qt4/html/images/screenshot-example.png share/doc/qt4/html/images/scribble-example.png +share/doc/qt4/html/images/scrollbar.png +share/doc/qt4/html/images/scrollbarimage.png share/doc/qt4/html/images/sdi-example.png share/doc/qt4/html/images/securesocketclient.png share/doc/qt4/html/images/securesocketclient2.png @@ -1160,9 +1191,15 @@ share/doc/qt4/html/images/simpletextviewer-findfiledialog.png share/doc/qt4/html/images/simpletextviewer-mainwindow.png share/doc/qt4/html/images/simpletreemodel-example.png share/doc/qt4/html/images/simplewidgetmapper-example.png +share/doc/qt4/html/images/sizegrip.png +share/doc/qt4/html/images/sizegripimage.png +share/doc/qt4/html/images/slider.png +share/doc/qt4/html/images/sliderimage.png share/doc/qt4/html/images/sliders-example.png +share/doc/qt4/html/images/spinbox.png share/doc/qt4/html/images/spinboxdelegate-example.png share/doc/qt4/html/images/spinboxes-example.png +share/doc/qt4/html/images/spinboximage.png share/doc/qt4/html/images/spreadsheet-demo.png share/doc/qt4/html/images/sql-examples.png share/doc/qt4/html/images/sqlbrowser-demo.png @@ -1214,6 +1251,7 @@ share/doc/qt4/html/images/t8.png share/doc/qt4/html/images/t9.png share/doc/qt4/html/images/t9_1.png share/doc/qt4/html/images/t9_2.png +share/doc/qt4/html/images/tab.png share/doc/qt4/html/images/tabWidget-stylesheet1.png share/doc/qt4/html/images/tabWidget-stylesheet2.png share/doc/qt4/html/images/tabWidget-stylesheet3.png @@ -1221,6 +1259,7 @@ share/doc/qt4/html/images/tabdialog-example.png share/doc/qt4/html/images/tableWidget-stylesheet.png share/doc/qt4/html/images/tablemodel-example.png share/doc/qt4/html/images/tabletexample.png +share/doc/qt4/html/images/tabwidget.png share/doc/qt4/html/images/taskmenuextension-dialog.png share/doc/qt4/html/images/taskmenuextension-example-faded.png share/doc/qt4/html/images/taskmenuextension-menu.png @@ -1230,11 +1269,21 @@ share/doc/qt4/html/images/textedit-demo.png share/doc/qt4/html/images/textfinder-example-find.png share/doc/qt4/html/images/textfinder-example-find2.png share/doc/qt4/html/images/textfinder-example-userinterface.png +share/doc/qt4/html/images/texttable-merge.png +share/doc/qt4/html/images/texttable-split.png share/doc/qt4/html/images/textures-example.png share/doc/qt4/html/images/thread-examples.png share/doc/qt4/html/images/threadedfortuneserver-example.png share/doc/qt4/html/images/threadsandobjects.png +share/doc/qt4/html/images/titlebar.png +share/doc/qt4/html/images/titlebarimage.png share/doc/qt4/html/images/tool-examples.png +share/doc/qt4/html/images/toolbar.png +share/doc/qt4/html/images/toolbarimage.png +share/doc/qt4/html/images/toolbox.png +share/doc/qt4/html/images/toolboximage.png +share/doc/qt4/html/images/toolbutton.png +share/doc/qt4/html/images/toolbuttonimage.png share/doc/qt4/html/images/tooltips-example.png share/doc/qt4/html/images/torrent-example.png share/doc/qt4/html/images/transformations-example.png @@ -1285,6 +1334,7 @@ share/doc/qt4/html/images/windows-timeedit.png share/doc/qt4/html/images/windows-toolbox.png share/doc/qt4/html/images/windows-toolbutton.png share/doc/qt4/html/images/windows-treeview.png +share/doc/qt4/html/images/windowstabimage.png share/doc/qt4/html/images/windowsvista-calendarwidget.png share/doc/qt4/html/images/windowsvista-checkbox.png share/doc/qt4/html/images/windowsvista-combobox.png @@ -1382,6 +1432,15 @@ share/doc/qt4/html/itemviews-customsortfiltermodel-window-h.html share/doc/qt4/html/itemviews-customsortfiltermodel.html share/doc/qt4/html/itemviews-dirview-main-cpp.html share/doc/qt4/html/itemviews-dirview.html +share/doc/qt4/html/itemviews-editabletreemodel-editabletreemodel-qrc.html +share/doc/qt4/html/itemviews-editabletreemodel-main-cpp.html +share/doc/qt4/html/itemviews-editabletreemodel-mainwindow-cpp.html +share/doc/qt4/html/itemviews-editabletreemodel-mainwindow-h.html +share/doc/qt4/html/itemviews-editabletreemodel-treeitem-cpp.html +share/doc/qt4/html/itemviews-editabletreemodel-treeitem-h.html +share/doc/qt4/html/itemviews-editabletreemodel-treemodel-cpp.html +share/doc/qt4/html/itemviews-editabletreemodel-treemodel-h.html +share/doc/qt4/html/itemviews-editabletreemodel.html share/doc/qt4/html/itemviews-pixelator-imagemodel-cpp.html share/doc/qt4/html/itemviews-pixelator-imagemodel-h.html share/doc/qt4/html/itemviews-pixelator-images-qrc.html @@ -1453,7 +1512,9 @@ share/doc/qt4/html/layouts-flowlayout-main-cpp.html share/doc/qt4/html/layouts-flowlayout-window-cpp.html share/doc/qt4/html/layouts-flowlayout-window-h.html share/doc/qt4/html/layouts-flowlayout.html +share/doc/qt4/html/license-gpl-exceptions.html share/doc/qt4/html/licenses-fonts.html +share/doc/qt4/html/licenses-gpl-exceptions-addendum.html share/doc/qt4/html/licenses.html share/doc/qt4/html/licensing.html share/doc/qt4/html/linguist-arrowpad-arrowpad-cpp.html @@ -1515,6 +1576,7 @@ share/doc/qt4/html/model-view-convenience.html share/doc/qt4/html/model-view-creating-models.html share/doc/qt4/html/model-view-delegate.html share/doc/qt4/html/model-view-dnd.html +share/doc/qt4/html/model-view-introduction.html share/doc/qt4/html/model-view-model-subclassing.html share/doc/qt4/html/model-view-model.html share/doc/qt4/html/model-view-programming.html @@ -1734,6 +1796,7 @@ share/doc/qt4/html/platform-notes-x11.html share/doc/qt4/html/platform-notes.html share/doc/qt4/html/plugins-howto.html share/doc/qt4/html/plugins.html +share/doc/qt4/html/porting-qsa.html share/doc/qt4/html/porting.html share/doc/qt4/html/porting4-designer.html share/doc/qt4/html/porting4-dnd.html @@ -3733,6 +3796,7 @@ share/doc/qt4/html/sql-relationaltablemodel-relationaltablemodel-cpp.html share/doc/qt4/html/sql-relationaltablemodel.html share/doc/qt4/html/sql-tablemodel-tablemodel-cpp.html share/doc/qt4/html/sql-tablemodel.html +share/doc/qt4/html/style-reference.html share/doc/qt4/html/stylesheet-customizing.html share/doc/qt4/html/stylesheet-designer.html share/doc/qt4/html/stylesheet-examples.html @@ -4075,8 +4139,6 @@ share/doc/qt4/html/xml-streambookmarks.html share/doc/qt4/html/xml-tools.html share/doc/qt4/html/xml-xmlstreamlint-main-cpp.html share/doc/qt4/html/xml-xmlstreamlint.html -share/nls/POSIX -share/nls/en_US.US-ASCII @dirrm share/doc/qt4/html/images @dirrm share/doc/qt4/html @dirrm share/doc/qt4 diff --git a/misc/qt4-qtconfig/distinfo b/misc/qt4-qtconfig/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/misc/qt4-qtconfig/distinfo +++ b/misc/qt4-qtconfig/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/misc/qt4-qtdemo/distinfo b/misc/qt4-qtdemo/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/misc/qt4-qtdemo/distinfo +++ b/misc/qt4-qtdemo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist index e782b838d521..b70885d3bd5b 100644 --- a/misc/qt4-qtdemo/pkg-plist +++ b/misc/qt4-qtdemo/pkg-plist @@ -1857,7 +1857,6 @@ share/qt4/examples/widgets/movie/movie.pro share/qt4/examples/widgets/movie/movie.qrc share/qt4/examples/widgets/movie/movieplayer.cpp share/qt4/examples/widgets/movie/movieplayer.h -share/qt4/examples/widgets/movie/movies/fire.mng share/qt4/examples/widgets/scribble/main.cpp share/qt4/examples/widgets/scribble/mainwindow.cpp share/qt4/examples/widgets/scribble/mainwindow.h @@ -2022,7 +2021,6 @@ share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.pro @dirrm share/qt4/examples/widgets/sliders @dirrm share/qt4/examples/widgets/shapedclock @dirrm share/qt4/examples/widgets/scribble -@dirrm share/qt4/examples/widgets/movie/movies @dirrm share/qt4/examples/widgets/movie/images @dirrm share/qt4/examples/widgets/movie @dirrm share/qt4/examples/widgets/lineedits diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index a8e0894be7b7..708fdb6189a1 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -62,6 +62,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/net/qt4-network/distinfo b/net/qt4-network/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/net/qt4-network/distinfo +++ b/net/qt4-network/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist index 777ada0d60e4..af6ba9f40141 100644 --- a/net/qt4-network/pkg-plist +++ b/net/qt4-network/pkg-plist @@ -30,6 +30,7 @@ include/QtNetwork/QIPv6Address include/QtNetwork/QNetworkAddressEntry include/QtNetwork/QNetworkInterface include/QtNetwork/QNetworkProxy +include/QtNetwork/QSsl include/QtNetwork/QSslCertificate include/QtNetwork/QSslCipher include/QtNetwork/QSslError @@ -64,7 +65,7 @@ lib/libQtNetwork.prl lib/libQtNetwork.so lib/libQtNetwork.so.4 lib/libQtNetwork.so.4.3 -lib/libQtNetwork.so.4.3.1 -%%DEBUG%%lib/libQtNetwork.so.4.3.1.debug +lib/libQtNetwork.so.4.3.4 +%%DEBUG%%lib/libQtNetwork.so.4.3.4.debug libdata/pkgconfig/QtNetwork.pc @dirrm include/QtNetwork diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 3c2fe41250ee..2650d0ea3a7d 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -61,6 +61,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/textproc/qt4-xml/distinfo b/textproc/qt4-xml/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/textproc/qt4-xml/distinfo +++ b/textproc/qt4-xml/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist index d2f097a231c0..76cdce0b6f32 100644 --- a/textproc/qt4-xml/pkg-plist +++ b/textproc/qt4-xml/pkg-plist @@ -53,7 +53,7 @@ lib/libQtXml.prl lib/libQtXml.so lib/libQtXml.so.4 lib/libQtXml.so.4.3 -lib/libQtXml.so.4.3.1 -%%DEBUG%%lib/libQtXml.so.4.3.1.debug +lib/libQtXml.so.4.3.4 +%%DEBUG%%lib/libQtXml.so.4.3.4.debug libdata/pkgconfig/QtXml.pc @dirrm include/QtXml diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 1654b107f057..208e6d3c1119 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -55,7 +55,7 @@ OPTIONS= CUPS "Enable printing support (requires CUPS)" off \ .if !defined(WITHOUT_CUPS) || defined(PACKAGE_BUILDING) BUILD_DEPENDS+= cupsd:${PORTSDIR}/print/cups-base -CUPS= -cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include +CUPS= -cups -L${LOCALBASE}/lib -I. -I../../include/Qt -I${LOCALBASE}/include .elif defined(WITHOUT_CUPS) CUPS= .endif @@ -85,6 +85,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.post.mk> diff --git a/x11-toolkits/qt4-gui/distinfo b/x11-toolkits/qt4-gui/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/x11-toolkits/qt4-gui/distinfo +++ b/x11-toolkits/qt4-gui/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff b/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff deleted file mode 100644 index ce23edfdf7b9..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-0185-fix-format-strings.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- src/gui/painting/qprintengine_pdf_p.h -+++ src/gui/painting/qprintengine_pdf_p.h -@@ -148,7 +148,11 @@ private: - void writePage(); - - int addXrefEntry(int object, bool printostr = true); -- void xprintf(const char* fmt, ...); -+ void xprintf(const char* fmt, ...) -+#if defined(Q_CC_GNU) && !defined(__INSURE__) -+ __attribute__ ((format (printf, 2, 3))) -+#endif -+ ; - inline void write(const QByteArray &data) { - stream->writeRawData(data.constData(), data.size()); - streampos += data.size(); ---- src/gui/painting/qprintengine_pdf.cpp -+++ src/gui/painting/qprintengine_pdf.cpp -@@ -386,9 +386,8 @@ int QPdfEnginePrivate::addConstantAlphaO - object = addXrefEntry(-1); - QByteArray alphaDef; - QPdf::ByteStream s(&alphaDef); -- s << "<< /ca " << (alpha/qreal(255.)) << ">>\n"; -- xprintf(alphaDef.constData()); -- xprintf("endobj\n"); -+ s << "<< /ca " << (alpha/qreal(255.)) << ">>"; -+ xprintf("%s\nendobj\n", alphaDef.constData()); - } - currentPage->graphicStates.append(object); - return object;
\ No newline at end of file diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist index 8124aeee287c..386f91e74d49 100644 --- a/x11-toolkits/qt4-gui/pkg-plist +++ b/x11-toolkits/qt4-gui/pkg-plist @@ -739,7 +739,7 @@ lib/libQtGui.prl lib/libQtGui.so lib/libQtGui.so.4 lib/libQtGui.so.4.3 -lib/libQtGui.so.4.3.1 -%%DEBUG%%lib/libQtGui.so.4.3.1.debug +lib/libQtGui.so.4.3.4 +%%DEBUG%%lib/libQtGui.so.4.3.4.debug libdata/pkgconfig/QtGui.pc @dirrm include/QtGui diff --git a/x11/qt4-inputmethods/distinfo b/x11/qt4-inputmethods/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/x11/qt4-inputmethods/distinfo +++ b/x11/qt4-inputmethods/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 06fc7a9437a2..8acef763b634 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -63,6 +63,7 @@ post-configure: ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + -E -e 's|(.*Cflags:.*)-I${LOCALBASE}/include |\1|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* .include <bsd.port.mk> diff --git a/x11/qt4-opengl/distinfo b/x11/qt4-opengl/distinfo index 8fbd772f627d..9451a68b5c02 100644 --- a/x11/qt4-opengl/distinfo +++ b/x11/qt4-opengl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 -SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 -SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 +MD5 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 9499101ec54eb7b0de195b3c5e3ffa93 +SHA256 (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2 +SIZE (KDE/qt-x11-opensource-src-4.3.4.tar.gz) = 43988710 diff --git a/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist index d633d542670c..cf8b3a55dfc7 100644 --- a/x11/qt4-opengl/pkg-plist +++ b/x11/qt4-opengl/pkg-plist @@ -7,6 +7,10 @@ include/QtOpenGL/QGLColormap include/QtOpenGL/QGLContext include/QtOpenGL/QGLFormat include/QtOpenGL/QGLFramebufferObject +include/QtOpenGL/QMacGLCompatTypes +include/QtOpenGL/QMacCompatGLint +include/QtOpenGL/QMacCompatGLuint +include/QtOpenGL/QMacCompatGLenum include/QtOpenGL/QGLPixelBuffer include/QtOpenGL/QGLWidget include/QtOpenGL/QtOpenGL @@ -19,7 +23,7 @@ lib/libQtOpenGL.prl lib/libQtOpenGL.so lib/libQtOpenGL.so.4 lib/libQtOpenGL.so.4.3 -lib/libQtOpenGL.so.4.3.1 -%%DEBUG%%lib/libQtOpenGL.so.4.3.1.debug +lib/libQtOpenGL.so.4.3.4 +%%DEBUG%%lib/libQtOpenGL.so.4.3.4.debug libdata/pkgconfig/QtOpenGL.pc @dirrm include/QtOpenGL |