diff options
author | adam <adam> | 2010-07-04 06:00:13 +0000 |
---|---|---|
committer | adam <adam> | 2010-07-04 06:00:13 +0000 |
commit | de7a6021457b00e92059ca6dc3748484e5889de0 (patch) | |
tree | 1755b632946af674a0894f3fe2beb2636f336716 /x11 | |
parent | 816fcc3a5ed0f8de8c0183ff6f03a27e2d2cae5d (diff) | |
download | pkgsrc-de7a6021457b00e92059ca6dc3748484e5889de0.tar.gz |
Changes 4.6.3:
* Added Spectrum analyzer demo application.
* Added exit softkey to Wiggly example.
* Added close button to Anomaly demo.
* Fixed Anomaly demo controlstrip icon placement for very small screens.
* Ensure history configuration is cleared when a state machine is restarted.
For more read: http://qt.nokia.com/developer/changes/changes-4.6.3
Diffstat (limited to 'x11')
-rw-r--r-- | x11/qt4-docs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile.common | 8 | ||||
-rw-r--r-- | x11/qt4-libs/distinfo | 22 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-af | 10 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ag | 6 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ao | 17 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aq | 8 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aw | 6 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ay | 8 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ba | 6 | ||||
-rw-r--r-- | x11/qt4-mng/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-mysql/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-pgsql/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-qdbus/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-sqlite3/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tiff/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tools/Makefile | 3 | ||||
-rw-r--r-- | x11/qt4-tools/PLIST | 5 | ||||
-rw-r--r-- | x11/qt4/Makefile.common | 4 |
20 files changed, 65 insertions, 62 deletions
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile index 8f2667e7635..c5476bf6f5e 100644 --- a/x11/qt4-docs/Makefile +++ b/x11/qt4-docs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-docs-${QTVERSION} COMMENT= Documentation for the QT C++ X GUI toolkit diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 08890c9f277..944c16e568f 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 3 COMMENT= C++ X GUI toolkit # XXX this is to test what really gets installed when 'do-install' is disabled diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 3d6c127c59f..edf35cbb093 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2010/02/02 14:33:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.21 2010/07/04 06:00:14 adam Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -10,8 +10,7 @@ DISTNAME= qt-everywhere-opensource-src-${QTVERSION} CATEGORIES= x11 -MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ - ftp://ftp.qtsoftware.com/qt/source/ +MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/ #EXTRACT_SUFX= .tar.bz2 .include "../../x11/qt4/Makefile.common" @@ -27,7 +26,7 @@ USE_TOOLS+= gmake QTPREFIX= ${PREFIX}/qt4 -CONFIGURE_ARGS+= -arch ${MACHINE_ARCH} +#CONFIGURE_ARGS+= -arch ${MACHINE_ARCH} CONFIGURE_ARGS+= -optimized-qmake CONFIGURE_ARGS+= -prefix "${QTPREFIX}" CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs @@ -70,6 +69,7 @@ SYS_LIBS= -lbind -ldb -ldl .elif ${OPSYS} == "DragonFly" CONFIGURE_ARGS+= -platform freebsd-g++ .elif ${OPSYS} == "Darwin" +#CONFIGURE_ARGS+= -cocoa QMAKE_RANLIB= ${RANLIB} . if exists(/usr/lib/libresolv.dylib) LDFLAGS+= -lresolv diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 2b036e325a6..200d2402336 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.44 2010/05/29 17:10:31 adam Exp $ +$NetBSD: distinfo,v 1.45 2010/07/04 06:00:14 adam Exp $ -SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 977c10b88a2230e96868edc78a9e3789c0fcbf70 -RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 5f3fea120f2dba274c4150b02162bba40b65a872 -Size (qt-everywhere-opensource-src-4.6.2.tar.gz) = 160601949 bytes +SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 +RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff +Size (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 bytes SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262 SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8 SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84 SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9 SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe -SHA1 (patch-af) = 9e49533cb835538a949bd71b53cebe15ab59b9de -SHA1 (patch-ag) = 6f31f1f5161cf5ad0d9fc09b097d3763e72e6bd6 +SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 +SHA1 (patch-ag) = c7573bf93741d91b4f81ca5f0e7d851c1a40239a SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df @@ -17,17 +17,17 @@ SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981 SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 -SHA1 (patch-ao) = 314769424b9ae5d7e794decb2f67a10820714ff5 +SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = 361befdb8e9110edffca5f82be1eb7a8923e5fa4 +SHA1 (patch-aq) = 1a7f8ba45c9a232c35c4db0094ae1ac2c795b6ab SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf -SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6 +SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 -SHA1 (patch-ay) = 29f62543381febdaf054e2b43e7449676dc0ecb7 +SHA1 (patch-ay) = ee700d2a4bf02be6a908c0aebe8e8bfd3b1f6c38 SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1 -SHA1 (patch-ba) = 97f9f21909cf42d04d6c40f1e297791e592b6532 +SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42 diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af index 3fd8dd978a2..609fe5a1e60 100644 --- a/x11/qt4-libs/patches/patch-af +++ b/x11/qt4-libs/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-af,v 1.8 2010/07/04 06:00:14 adam Exp $ ---- qmake/Makefile.unix.orig 2010-01-15 17:01:30.000000000 +0000 +--- qmake/Makefile.unix.orig 2010-06-02 02:03:09.000000000 +0000 +++ qmake/Makefile.unix @@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ QTOBJS = @QMAKE_QTOBJS@ @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $ #qmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ -@@ -59,7 +59,7 @@ DEPEND_SRC=project.cpp property.cpp meta +@@ -63,7 +63,7 @@ DEPEND_SRC=project.cpp property.cpp meta $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ $(QTSRCS) @@ -19,8 +19,8 @@ $NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $ +CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ - -DQT_NO_PCRE \ -@@ -68,7 +68,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators + -I$(SOURCE_PATH)/tools/shared \ +@@ -73,7 +73,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag index ac09484615f..bd98dd98639 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.10 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-ag,v 1.11 2010/07/04 06:00:14 adam Exp $ ---- qmake/project.cpp.orig 2010-01-15 17:01:30.000000000 +0000 +--- qmake/project.cpp.orig 2010-06-02 02:03:09.000000000 +0000 +++ qmake/project.cpp -@@ -1612,6 +1612,9 @@ QMakeProject::isActiveConfig(const QStri +@@ -1614,6 +1614,9 @@ QMakeProject::isActiveConfig(const QStri if(isForSymbian() && (x == "symbian" || x == "unix")) return true; diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao index 46bfa02b787..a05cffc04d9 100644 --- a/x11/qt4-libs/patches/patch-ao +++ b/x11/qt4-libs/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 +--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-06-02 02:03:17.000000000 +0000 +++ src/corelib/codecs/qiconvcodec.cpp @@ -50,9 +50,14 @@ #include <stdio.h> @@ -37,7 +37,16 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ // GNU doesn't disagree with POSIX :/ const char *inBytes = chars; #else -@@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico +@@ -311,7 +319,7 @@ static bool setByteOrder(iconv_t cd) + size_t outBytesLeft = sizeof buf; + size_t inBytesLeft = sizeof bom; + +-#if defined(GNU_LIBICONV) ++#if defined(GNU_LIBICONV) || defined(__NetBSD__) + const char **inBytesPtr = const_cast<const char **>(&inBytes); + #else + char **inBytesPtr = &inBytes; +@@ -331,7 +339,7 @@ QByteArray QIconvCodec::convertFromUnico char *outBytes; size_t inBytesLeft; @@ -46,7 +55,7 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ const char **inBytesPtr = const_cast<const char **>(&inBytes); #else char **inBytesPtr = &inBytes; -@@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const +@@ -468,11 +476,13 @@ iconv_t QIconvCodec::createIconv_t(const static const char empty_codeset[] = ""; const char *codeset = empty_codeset; cd = iconv_open(to ? to : codeset, from ? from : codeset); diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index d05b4d01f1f..75e3db2e024 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-aq,v 1.7 2010/07/04 06:00:14 adam Exp $ ---- configure.orig 2010-01-15 17:01:30.000000000 +0000 +--- configure.orig 2010-06-02 02:03:10.000000000 +0000 +++ configure -@@ -3069,7 +3069,7 @@ fi +@@ -3071,7 +3071,7 @@ fi if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then # get the darwin version. 10.0.0 and up means snow leopard. VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -11,7 +11,7 @@ $NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -7002,7 +7002,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" diff --git a/x11/qt4-libs/patches/patch-aw b/x11/qt4-libs/patches/patch-aw index 78013eeaf3b..a0da8cf79b5 100644 --- a/x11/qt4-libs/patches/patch-aw +++ b/x11/qt4-libs/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.1 2010/01/29 18:19:09 adam Exp $ +$NetBSD: patch-aw,v 1.2 2010/07/04 06:00:14 adam Exp $ ---- src/network/kernel/qhostinfo_unix.cpp.orig 2010-01-28 07:21:09.000000000 +0000 +--- src/network/kernel/qhostinfo_unix.cpp.orig 2010-06-02 02:03:17.000000000 +0000 +++ src/network/kernel/qhostinfo_unix.cpp -@@ -116,6 +116,8 @@ static void resolveLibrary() +@@ -117,6 +117,8 @@ static void resolveLibrary() if (!local_res_nclose) local_res_ninit = 0; } diff --git a/x11/qt4-libs/patches/patch-ay b/x11/qt4-libs/patches/patch-ay index cf2240a0759..10b99cd7b53 100644 --- a/x11/qt4-libs/patches/patch-ay +++ b/x11/qt4-libs/patches/patch-ay @@ -1,6 +1,6 @@ -$NetBSD: patch-ay,v 1.6 2010/05/29 17:10:31 adam Exp $ +$NetBSD: patch-ay,v 1.7 2010/07/04 06:00:14 adam Exp $ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-02-11 15:55:20.000000000 +0000 +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-06-02 02:03:12.000000000 +0000 +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -86,6 +86,13 @@ #define WTF_PLATFORM_OPENBSD 1 @@ -24,12 +24,12 @@ $NetBSD: patch-ay,v 1.6 2010/05/29 17:10:31 adam Exp $ || PLATFORM(SYMBIAN) \ || PLATFORM(NETBSD) \ || PLATFORM(SOLARIS) \ -@@ -718,7 +726,7 @@ +@@ -723,7 +731,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) +#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 - #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) + #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 diff --git a/x11/qt4-libs/patches/patch-ba b/x11/qt4-libs/patches/patch-ba index 0b4132254d3..b92aa3c399c 100644 --- a/x11/qt4-libs/patches/patch-ba +++ b/x11/qt4-libs/patches/patch-ba @@ -1,10 +1,10 @@ -$NetBSD: patch-ba,v 1.4 2010/04/16 11:45:27 wiz Exp $ +$NetBSD: patch-ba,v 1.5 2010/07/04 06:00:14 adam Exp $ http://bugreports.qt.nokia.com/browse/QTBUG-6932 ---- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-02-11 15:55:22.000000000 +0000 +--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-06-02 02:03:15.000000000 +0000 +++ src/gui/graphicsview/qgraphicsitem_p.h -@@ -678,7 +678,7 @@ inline bool qt_closestItemFirst(const QG +@@ -679,7 +679,7 @@ inline bool qt_closestItemFirst(const QG // item1Ancestor is now at the same level as item2Ancestor, but not the same. const QGraphicsItem *p1 = t1; const QGraphicsItem *p2 = t2; diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile index d2460ffd4c4..397f102aced 100644 --- a/x11/qt4-mng/Makefile +++ b/x11/qt4-mng/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-mng-${QTVERSION} COMMENT= QT MNG image format plugin diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile index f1d1f162b54..cc6fdfac2da 100644 --- a/x11/qt4-mysql/Makefile +++ b/x11/qt4-mysql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-mysql-${QTVERSION} COMMENT= QT mysql driver diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile index 680be049a1a..14061fccd52 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-pgsql-${QTVERSION} COMMENT= QT postgresql driver diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile index 19eab57ba65..4cbba743c73 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:51 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/07/04 06:00:14 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-qdbus-${QTVERSION} COMMENT= QT DBus support diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 862ddd23dce..e39d9810774 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/07/04 06:00:15 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-sqlite3-${QTVERSION} COMMENT= QT sqlite3 driver diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile index 6d6d2e63f45..b5698006510 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/07/04 06:00:15 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-tiff-${QTVERSION} COMMENT= QT TIFF image format plugin diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index 6ac8c38924d..c705356b187 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:52 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/07/04 06:00:15 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "../../x11/qt4-libs/Makefile.common" -PKGREVISION= 1 PKGNAME= qt4-tools-${QTVERSION} COMMENT= QT GUI (WYSIWYG) builder and other tools diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 552d2f2479d..b713b25afb5 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2010/02/16 13:08:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.22 2010/07/04 06:00:15 adam Exp $ lib/pkgconfig/QtAssistantClient.pc lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc @@ -213,6 +213,7 @@ qt4/mkspecs/features/silent.prf qt4/mkspecs/features/static.prf qt4/mkspecs/features/static_and_shared.prf qt4/mkspecs/features/staticlib.prf +qt4/mkspecs/features/symbian/add_mmp_rules.prf qt4/mkspecs/features/symbian/application_icon.prf qt4/mkspecs/features/symbian/armcc_warnings.prf qt4/mkspecs/features/symbian/data_caging_paths.prf @@ -422,12 +423,14 @@ qt4/mkspecs/solaris-g++-64/qplatformdefs.h qt4/mkspecs/solaris-g++/qmake.conf qt4/mkspecs/solaris-g++/qplatformdefs.h qt4/mkspecs/symbian-abld/qmake.conf +qt4/mkspecs/symbian-abld/qplatformdefs.h qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml qt4/mkspecs/symbian-sbsv2/qmake.conf +qt4/mkspecs/symbian-sbsv2/qplatformdefs.h qt4/mkspecs/tru64-cxx/qmake.conf qt4/mkspecs/tru64-cxx/qplatformdefs.h qt4/mkspecs/tru64-g++/qmake.conf diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index d0597a56708..2f9966e116d 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.21 2010/02/16 13:08:09 adam Exp $ +# $NetBSD: Makefile.common,v 1.22 2010/07/04 06:00:13 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.6.2 +QTVERSION= 4.6.3 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= http://qt.nokia.com/ |