diff options
26 files changed, 140 insertions, 220 deletions
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile index 2c1e85416da..eb28dd1dc95 100644 --- a/x11/qt4-docs/Makefile +++ b/x11/qt4-docs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2013/07/07 18:13:56 adam Exp $ PKGNAME= qt4-docs-${QTVERSION} -PKGREVISION= 5 COMMENT= Documentation for the QT C++ X GUI toolkit .include "../../x11/qt4-libs/Makefile.common" diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 66564b985b0..63837828acc 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.91 2013/06/06 12:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.92 2013/07/07 18:13:56 adam Exp $ PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 7 COMMENT= C++ X GUI toolkit .include "../../x11/qt4-libs/Makefile.common" @@ -29,6 +28,7 @@ CONFIGURE_ARGS+= -openssl-linked .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing +CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1 .endif INSTALLATION_DIRS= lib/pkgconfig @@ -36,6 +36,7 @@ INSTALLATION_DIRS+= ${QTPREFIX}/bin INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles +INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/shaders INSTALLATION_DIRS+= ${QTPREFIX}/imports/QtWebKit INSTALLATION_DIRS+= ${QTPREFIX}/include INSTALLATION_DIRS+= ${QTPREFIX}/lib @@ -60,8 +61,8 @@ SUBST_FILES.no-libtool= translations/Makefile SUBST_SED.no-libtool= -e '/@: IGNORE THIS LINE/s,=.*$$,= @:,' do-install: -.for prog in moc rcc uic - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ +.for f in moc rcc uic + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DESTDIR}${QTPREFIX}/bin/ .endfor ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ ${DESTDIR}${QTPREFIX}/bin/ @@ -74,47 +75,59 @@ do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} \ ${WRKSRC}/imports/Qt/labs/particles/libqmlparticlesplugin.la \ ${DESTDIR}${QTPREFIX}/imports/Qt/labs/particles/ - ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/imports/Qt/labs/shaders/libqmlshadersplugin.la \ + ${DESTDIR}${QTPREFIX}/imports/Qt/labs/shaders/ + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ ${WRKSRC}/imports/QtWebKit/libqmlwebkitplugin.la \ ${DESTDIR}${QTPREFIX}/imports/QtWebKit/ -.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/Source/WebKit/qt - cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ +.for f in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/Source/WebKit/qt + cd ${WRKSRC}/src/${f} && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers .endfor cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST -.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore webcore - ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ +.for f in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore webcore + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${f}.la \ ${DESTDIR}${QTPREFIX}/lib/ sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ -e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \ - ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc - ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ + ${WRKSRC}/lib/pkgconfig/${f}.pc > ${WRKDIR}/${f}.pc + ${INSTALL_DATA} ${WRKDIR}/${f}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ .endfor ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} -.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets +.for f in qtaccessiblecompatwidgets qtaccessiblewidgets ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/accessible/lib${plug}.la \ + ${WRKSRC}/plugins/accessible/lib${f}.la \ ${DESTDIR}${QTPREFIX}/plugins/accessible/ .endfor +#.for f in qcorewlanbearer qgenericbearer +.if ${OPSYS} == "Darwin" + ${LIBTOOL} --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/plugins/bearer/libqcorewlanbearer.la \ + ${DESTDIR}${QTPREFIX}/plugins/bearer/ +.endif ${LIBTOOL} --mode=install ${INSTALL_LIB} \ ${WRKSRC}/plugins/bearer/libqgenericbearer.la \ ${DESTDIR}${QTPREFIX}/plugins/bearer/ -.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs +#.endfor +.for f in qcncodecs qjpcodecs qkrcodecs qtwcodecs ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/codecs/lib${codec}.la \ + ${WRKSRC}/plugins/codecs/lib${f}.la \ ${DESTDIR}${QTPREFIX}/plugins/codecs/ .endfor -.for plug in qglgraphicssystem qtracegraphicssystem +.for f in qglgraphicssystem qtracegraphicssystem ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/graphicssystems/lib${plug}.la \ + ${WRKSRC}/plugins/graphicssystems/lib${f}.la \ ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/ .endfor +.for f in qsvgicon ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/iconengines/libqsvgicon.la \ + ${WRKSRC}/plugins/iconengines/lib${f}.la \ ${DESTDIR}/${QTPREFIX}/plugins/iconengines/ -.for plug in qgif qico qjpeg qsvg qtga +.endfor +.for f in qgif qico qjpeg qsvg qtga ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/imageformats/lib${plug}.la \ + ${WRKSRC}/plugins/imageformats/lib${f}.la \ ${DESTDIR}${QTPREFIX}/plugins/imageformats/ .endfor .if ${OPSYS} == "Darwin" diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index c920ed82342..fdf3356b41c 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2013/01/11 00:15:40 joerg Exp $ +# $NetBSD: Makefile.common,v 1.36 2013/07/07 18:13:56 adam Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -10,7 +10,7 @@ DISTNAME= qt-everywhere-opensource-src-${QTVERSION} CATEGORIES= x11 -MASTER_SITES= http://releases.qt-project.org/qt4/source/ +MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/ EXTRACT_USING= bsdtar .include "../../x11/qt4/Makefile.common" diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST index 96ddc46e4b0..fdc3f52305d 100644 --- a/x11/qt4-libs/PLIST +++ b/x11/qt4-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2012/01/12 22:59:58 adam Exp $ +@comment $NetBSD: PLIST,v 1.19 2013/07/07 18:13:56 adam Exp $ lib/pkgconfig/Qt3Support.pc lib/pkgconfig/QtCore.pc lib/pkgconfig/QtDeclarative.pc @@ -23,6 +23,7 @@ qt4/bin/uic3 qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.la qt4/imports/Qt/labs/particles/libqmlparticlesplugin.la +qt4/imports/Qt/labs/shaders/libqmlshadersplugin.la qt4/imports/QtWebKit/libqmlwebkitplugin.la qt4/lib/libQt3Support.la qt4/lib/libQtCore.la @@ -43,6 +44,7 @@ qt4/lib/libjscore.la qt4/lib/libwebcore.la qt4/plugins/accessible/libqtaccessiblecompatwidgets.la qt4/plugins/accessible/libqtaccessiblewidgets.la +${PLIST.mac}qt4/plugins/bearer/libqcorewlanbearer.la qt4/plugins/bearer/libqgenericbearer.la qt4/plugins/codecs/libqcncodecs.la qt4/plugins/codecs/libqjpcodecs.la diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 7133ebc87cb..42d86c97d43 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.86 2013/05/19 09:10:10 adam Exp $ +$NetBSD: distinfo,v 1.87 2013/07/07 18:13:56 adam Exp $ -SHA1 (qt-everywhere-opensource-src-4.8.4.tar.gz) = f5880f11c139d7d8d01ecb8d874535f7d9553198 -RMD160 (qt-everywhere-opensource-src-4.8.4.tar.gz) = 3c09a3b1411385d0917225f01ac2ff3a2ce83fda -Size (qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 bytes +SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e +RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d +Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609 SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 @@ -19,11 +19,11 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91 SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 -SHA1 (patch-aq) = 5821207c6c2340dd048cb29be23b56af27d5ef79 +SHA1 (patch-aq) = d2818f69e89a2d0531df57daabd255ddeef0acb9 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b -SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf +SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880 SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94 SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 @@ -37,26 +37,25 @@ SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207 SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31 SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64 -SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da341afc4ebfe32a2eb80e38c3307648 SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855 SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8 -SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp) = a9e94ed9becb0d5a88b30f721048509cd0d6b5a5 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6 -SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = a63219598a2bd6b6e660fb15ccebec3b327a60d1 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = 66b510e7f8a3a33f9934ad77bbe00a6c24b60d74 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = d1ff007f2070a57aba65e9eac49c9b3df7f3a583 +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95eb0e9aa01aedf148bd0ad53a59a1418081e623 -SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = 38d34aa7df1214cadd8e82c857d7056e2deda429 +SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e -SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 0c2c47ed2f522d17ce44f3f3c17ca0655a4c5b0b +SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = c22f73ad58f2ae2f80e3dfce3df6fe75b20ede39 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7 @@ -70,11 +69,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReply SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5 SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp) = 87518d8aa1363d9d56358d69f896593369cf0ba9 SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp) = 1a3417f521d238a845a0afc750fcf3e2a71c2fc8 -SHA1 (patch-src_corelib_animation_qpropertyanimation.cpp) = c6fb5cdfed1013f904b4a194d3c9fcab86a2327c SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268 -SHA1 (patch-src_corelib_tools_qiterator.h) = 40c4807719e6555a40f6a738330ad5037d6c80ad -SHA1 (patch-src_declarative_util_qdeclarativefontloader.cpp) = 0bb76eac102a4325cadb5bcb4e7a1ac85a3d099f -SHA1 (patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h) = 84d356628d764797524fe72139ea6829a33524ea SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80 diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq index 3008e6fd2cc..fecd310c6d8 100644 --- a/x11/qt4-libs/patches/patch-aq +++ b/x11/qt4-libs/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ +$NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $ ---- configure.orig 2012-11-23 10:11:23.000000000 +0000 +--- configure.orig 2013-06-07 05:16:41.000000000 +0000 +++ configure -@@ -3224,13 +3224,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then +@@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then CFG_HOST_ARCH=x86_64 fi ;; @@ -18,7 +18,7 @@ $NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ if [ "$OPT_VERBOSE" = "yes" ]; then echo " 64-bit PowerPC (powerpc)" fi -@@ -3254,6 +3254,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then +@@ -3253,6 +3253,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then fi CFG_HOST_ARCH=sparc ;; @@ -38,16 +38,16 @@ $NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ QNX:*:*) case "$UNAME_MACHINE" in x86pc) -@@ -3562,7 +3575,7 @@ fi +@@ -3561,7 +3574,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}'` -- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then -+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then +- if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then ++ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then echo echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " echo -@@ -5049,7 +5062,7 @@ if true; then ###[ '!' -f "$outpath/bin/ +@@ -5058,7 +5071,7 @@ if true; then ###[ '!' -f "$outpath/bin/ done QMAKE_BUILD_ERROR=no @@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2 -@@ -7140,7 +7153,7 @@ fi +@@ -7158,7 +7171,7 @@ fi # select Carbon on 10.4 Tiger. if [ "$PLATFORM_MAC" = "yes" ]; then VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` @@ -65,7 +65,7 @@ $NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ CFG_MAC_COCOA="no"; CFG_MAC_CARBON="yes"; fi -@@ -8402,7 +8415,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -8422,7 +8435,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" @@ -74,7 +74,7 @@ $NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $ if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -8618,6 +8631,7 @@ cat >>"$QTCONFIG.tmp" <<EOF +@@ -8638,6 +8651,7 @@ cat >>"$QTCONFIG.tmp" <<EOF #configuration CONFIG += $QTCONFIG_CONFIG QT_ARCH = $CFG_ARCH diff --git a/x11/qt4-libs/patches/patch-av b/x11/qt4-libs/patches/patch-av index df0622df1dd..c8551128df5 100644 --- a/x11/qt4-libs/patches/patch-av +++ b/x11/qt4-libs/patches/patch-av @@ -1,9 +1,9 @@ -$NetBSD: patch-av,v 1.1 2009/06/13 11:55:51 hasso Exp $ +$NetBSD: patch-av,v 1.2 2013/07/07 18:13:56 adam Exp $ ---- config.tests/mac/dwarf2.test.orig 2009-03-11 15:13:41.000000000 +0100 +--- config.tests/mac/dwarf2.test.orig 2013-06-07 05:16:41.000000000 +0000 +++ config.tests/mac/dwarf2.test -@@ -21,7 +21,7 @@ rm -f dwarf2.c dwarf2.o - "$COMPILER" $WORKDIR/xcodeversion.cpp -o xcodeversion -framework Carbon; +@@ -41,7 +41,7 @@ rm -f dwarf2.c dwarf2.o + "$COMPILER" $WORKDIR/xcodeversion.cpp $CXXFLAGS $LFLAGS -o xcodeversion -framework Carbon; ./xcodeversion -if [ "$?" == "1" ]; then @@ -11,7 +11,7 @@ $NetBSD: patch-av,v 1.1 2009/06/13 11:55:51 hasso Exp $ DWARF2_SUPPORT_BROKEN=yes fi -@@ -32,7 +32,7 @@ if [ "$DWARF2_SUPPORT" != "yes" ]; then +@@ -52,7 +52,7 @@ if [ "$DWARF2_SUPPORT" != "yes" ]; then [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled." exit 0 else diff --git a/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829 b/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829 deleted file mode 100644 index cdb94b25a73..00000000000 --- a/x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829 +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src-tools-mocmain.cpp-QTBUG-22829,v 1.1 2012/02/27 12:41:22 reinoud Exp $ - ---- src/tools/moc/main.cpp.orig 2011-12-08 05:06:03.000000000 +0000 -+++ src/tools/moc/main.cpp -@@ -187,6 +187,8 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ // rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829 -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; - QByteArray filename; - QByteArray output; - FILE *in = 0; diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp deleted file mode 100644 index b2b93646d9a..00000000000 --- a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp,v 1.1 2012/11/02 22:30:31 joerg Exp $ - ---- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp.orig 2012-11-02 10:51:13.000000000 +0000 -+++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp -@@ -2493,8 +2493,10 @@ JSValue Interpreter::privateExecute(Exec - vPC += OPCODE_LENGTH(op_get_by_pname); - NEXT_INSTRUCTION(); - } -+ { - Identifier propertyName(callFrame, subscript.toString(callFrame)); - result = baseValue.get(callFrame, propertyName); -+ } - CHECK_FOR_EXCEPTION(); - callFrame->r(dst) = result; - vPC += OPCODE_LENGTH(op_get_by_pname); diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h index 103c1ff796d..cf1108cffbb 100644 --- a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h +++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h @@ -1,4 +1,4 @@ -$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h,v 1.1 2013/05/09 14:07:08 joerg Exp $ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h,v 1.2 2013/07/07 18:13:56 adam Exp $ --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h.orig 2013-04-29 18:21:34.000000000 +0000 +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h @@ -7,7 +7,7 @@ $NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h,v 1.1 using std::swap; -#if !COMPILER(MSVC) && !OS(QNX) -+#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) ++#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) && !defined(__GXX_EXPERIMENTAL_CXX0X__) // The Dinkumware C++ library (used by MSVC and QNX) has a swap for pairs defined. // swap pairs by component, in case of pair members that specialize swap diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h new file mode 100644 index 00000000000..eba4f58754b --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h,v 1.1 2013/07/07 18:13:56 adam Exp $ + +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h.orig 2013-06-07 05:16:58.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h +@@ -25,7 +25,7 @@ + #include "Platform.h" + + #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) +-#include <type_traits> ++#include <tr1/type_traits> + #endif + + namespace WTF { diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h index a16db0561ae..649c07846e5 100644 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h @@ -1,36 +1,33 @@ -$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h,v 1.1 2013/05/09 14:07:08 joerg Exp $ +$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h,v 1.2 2013/07/07 18:13:56 adam Exp $ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2012-11-23 10:10:05.000000000 +0000 +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2013-06-07 05:16:54.000000000 +0000 +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h -@@ -61,7 +61,9 @@ - - #include "Platform.h" - --#if OS(WINDOWS) -+#if __cplusplus >= 201103L +@@ -69,6 +69,8 @@ + #include <cutils/atomic.h> + #elif OS(QNX) + #include <atomic.h> ++#elif __cplusplus >= 201103L +#include <atomic> -+#elif OS(WINDOWS) - #include <windows.h> - #elif OS(DARWIN) - #include <libkern/OSAtomic.h> -@@ -79,7 +82,11 @@ - - namespace WTF { - --#if OS(WINDOWS) -+#if __cplusplus >= 201103L + #elif COMPILER(GCC) && !OS(SYMBIAN) + #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) + #include <ext/atomicity.h> +@@ -106,6 +108,11 @@ inline int atomicDecrement(int volatile* + inline int atomicIncrement(int volatile* addend) { return (int) atomic_add_value((unsigned int volatile*)addend, 1); } + inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value((unsigned int volatile*)addend, 1); } + ++#elif __cplusplus >= 201103L +#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 +inline int atomicIncrement(std::atomic<int> * addend) { return *addend++; } +inline int atomicDecrement(std::atomic<int> * addend) { return *addend--; } -+#elif OS(WINDOWS) ++ + #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 - #if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE) -@@ -114,9 +126,15 @@ inline int atomicDecrement(int volatile* +@@ -114,9 +121,15 @@ inline int atomicDecrement(int volatile* #endif -+#if __cplusplus >= 201103L ++#if !OS(DARWIN) && __cplusplus >= 201103L +typedef std::atomic<int> atomic_int; +#else +typedef int volatile atomic_int; diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h index bc4523e88cc..492ff1f15b3 100644 --- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h @@ -1,13 +1,20 @@ -$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h,v 1.1 2013/05/09 14:07:08 joerg Exp $ +$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h,v 1.2 2013/07/07 18:13:56 adam Exp $ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2013-04-29 18:43:12.000000000 +0000 +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2013-06-07 05:16:54.000000000 +0000 +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h -@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI +@@ -35,8 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI #define __has_feature(feature) 0 #endif -#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) +#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) ++#if defined(__clang__) && !defined(_LIBCPP_VERSION) ++namespace std ++{ ++ typedef decltype(nullptr) nullptr_t; ++} ++#endif #define HAVE_NULLPTR 1 + #else diff --git a/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp b/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp deleted file mode 100644 index 8834c6ad2b1..00000000000 --- a/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-src_corelib_animation_qpropertyanimation.cpp,v 1.1 2013/04/13 10:29:26 jaapb Exp $ - -Patch from Qt bug 29082, solving a problem with KDE crashes ---- src/corelib/animation/qpropertyanimation.cpp.orig 2012-11-23 10:09:55.000000000 +0000 -+++ src/corelib/animation/qpropertyanimation.cpp -@@ -135,8 +135,11 @@ void QPropertyAnimationPrivate::updatePr - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast<void*>(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } diff --git a/x11/qt4-libs/patches/patch-src_corelib_tools_qiterator.h b/x11/qt4-libs/patches/patch-src_corelib_tools_qiterator.h deleted file mode 100644 index 5642044f43f..00000000000 --- a/x11/qt4-libs/patches/patch-src_corelib_tools_qiterator.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_corelib_tools_qiterator.h,v 1.1 2013/05/09 14:07:08 joerg Exp $ - ---- src/corelib/tools/qiterator.h.orig 2013-05-09 12:25:20.000000000 +0000 -+++ src/corelib/tools/qiterator.h -@@ -47,10 +47,7 @@ - QT_BEGIN_HEADER - - #ifdef QT_NO_STL --namespace std { -- struct bidirectional_iterator_tag; -- struct random_access_iterator_tag; --} -+#include <iterator> - #endif - - QT_BEGIN_NAMESPACE diff --git a/x11/qt4-libs/patches/patch-src_declarative_util_qdeclarativefontloader.cpp b/x11/qt4-libs/patches/patch-src_declarative_util_qdeclarativefontloader.cpp deleted file mode 100644 index d54ba14742a..00000000000 --- a/x11/qt4-libs/patches/patch-src_declarative_util_qdeclarativefontloader.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_declarative_util_qdeclarativefontloader.cpp,v 1.1 2013/01/11 23:37:13 joerg Exp $ - ---- src/declarative/util/qdeclarativefontloader.cpp.orig 2013-01-11 14:02:03.000000000 +0000 -+++ src/declarative/util/qdeclarativefontloader.cpp -@@ -64,7 +64,7 @@ class QDeclarativeFontObject : public QO - Q_OBJECT - - public: -- QDeclarativeFontObject(int _id); -+ QDeclarativeFontObject(int _id = -1); - - void download(const QUrl &url, QNetworkAccessManager *manager); - -@@ -84,7 +84,7 @@ private: - Q_DISABLE_COPY(QDeclarativeFontObject) - }; - --QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1) -+QDeclarativeFontObject::QDeclarativeFontObject(int _id) - : QObject(0), id(_id), reply(0), redirectCount(0) {} - - diff --git a/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h b/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h deleted file mode 100644 index 72dbd1b98fb..00000000000 --- a/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h,v 1.1 2013/05/19 09:10:10 adam Exp $ - -Fix building on Mac OS X. - ---- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig 2013-05-19 08:02:18.000000000 +0000 -+++ src/gui/kernel/qt_cocoa_helpers_mac_p.h -@@ -155,7 +155,7 @@ bool qt_dispatchKeyEvent(void * /*NSEven - void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent); - bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event); - inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); } --struct ::TabletProximityRec; -+struct TabletProximityRec; - void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); - Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); - Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile index 88c8fe4b7b4..00605543709 100644 --- a/x11/qt4-mng/Makefile +++ b/x11/qt4-mng/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2013/07/07 18:13:56 adam Exp $ PKGNAME= qt4-mng-${QTVERSION} -PKGREVISION= 5 COMMENT= QT MNG image format plugin .include "../../x11/qt4-libs/Makefile.common" diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile index 807fa74ec84..127bff497b0 100644 --- a/x11/qt4-mysql/Makefile +++ b/x11/qt4-mysql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-mysql-${QTVERSION} -PKGREVISION= 6 COMMENT= QT mysql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile index 534a5bbbfc0..3f9f0e1a384 100644 --- a/x11/qt4-pgsql/Makefile +++ b/x11/qt4-pgsql/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-pgsql-${QTVERSION} -PKGREVISION= 5 COMMENT= QT postgresql driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile index 66600f524ef..7bd4dfd0570 100644 --- a/x11/qt4-qdbus/Makefile +++ b/x11/qt4-qdbus/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2013/06/06 12:53:42 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-qdbus-${QTVERSION} -PKGREVISION= 5 COMMENT= QT DBus support CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib @@ -32,8 +31,8 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} INSTALL_ROOT=${DESTDIR} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers -.for prog in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ +.for f in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} \ ${DESTDIR}${QTPREFIX}/bin .endfor diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile index 2087d9686de..bf9af6b541a 100644 --- a/x11/qt4-sqlite3/Makefile +++ b/x11/qt4-sqlite3/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-sqlite3-${QTVERSION} -PKGREVISION= 6 COMMENT= Qt4 sqlite3 driver CONFIGURE_ARGS+= -I${QTDIR}/include diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile index 117784111be..e2a8f0e2914 100644 --- a/x11/qt4-tiff/Makefile +++ b/x11/qt4-tiff/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2013/06/06 12:55:21 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tiff-${QTVERSION} -PKGREVISION= 5 COMMENT= QT TIFF image format plugin CONFIGURE_ARGS+= -I${QTDIR}/include @@ -16,13 +15,11 @@ do-build: cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} -IMGFMTDIR= ${QTPREFIX}/plugins/imageformats - -INSTALLATION_DIRS= ${IMGFMTDIR} +INSTALLATION_DIRS= ${QTPREFIX}/plugins/imageformats do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqtiff.la \ - ${DESTDIR}${IMGFMTDIR} + ${DESTDIR}${QTPREFIX}/plugins/imageformats # up to 4.3.2 a builtin libtiff is used BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1 diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index cce7fd534dc..1ec7291af6c 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2013/06/06 12:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2013/07/07 18:13:57 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tools-${QTVERSION} -PKGREVISION= 5 COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base @@ -52,13 +51,12 @@ QTPROG_LT+= assistant designer linguist .endif do-install: -.for prog in ${QTPROG_BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ - ${DESTDIR}${QTPREFIX}/bin/${prog:tl} +.for f in ${QTPROG_BIN} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DESTDIR}${QTPREFIX}/bin/${f:tl} .endfor -.for prog in ${QTPROG_LT} - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ - ${DESTDIR}${QTPREFIX}/bin/${prog:tl} +.for f in ${QTPROG_LT} + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} \ + ${DESTDIR}${QTPREFIX}/bin/${f:tl} .endfor cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers @@ -66,16 +64,16 @@ do-install: ${MAKE_PROGRAM} install_designer_headers cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_quitools_headers -.for lib in QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools - ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ +.for f in QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${f}.la \ ${DESTDIR}${QTPREFIX}/lib/ sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ - ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc - ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ + ${WRKSRC}/lib/pkgconfig/${f}.pc > ${WRKDIR}/${f}.pc + ${INSTALL_DATA} ${WRKDIR}/${f}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ .endfor -.for lib in qdeclarativeview qt3supportwidgets qwebview +.for f in qdeclarativeview qt3supportwidgets qwebview ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/plugins/designer/lib${lib}.la \ + ${WRKSRC}/plugins/designer/lib${f}.la \ ${DESTDIR}${QTPREFIX}/plugins/designer/ .endfor ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ @@ -83,6 +81,6 @@ do-install: cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} .include "../../converters/libiconv/buildlink3.mk" -.include "../../x11/qt4-libs/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../x11/qt4-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 0adf277a5d6..18ff7e59181 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2012/12/07 10:06:14 adam Exp $ +@comment $NetBSD: PLIST,v 1.33 2013/07/07 18:13:57 adam Exp $ lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc lib/pkgconfig/QtDesignerComponents.pc @@ -150,6 +150,10 @@ qt4/mkspecs/aix-xlc/qmake.conf qt4/mkspecs/aix-xlc/qplatformdefs.h qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h +qt4/mkspecs/blackberry-playbook-armv7le-qcc/qmake.conf +qt4/mkspecs/blackberry-playbook-armv7le-qcc/qplatformdefs.h +qt4/mkspecs/blackberry-playbook-x86-qcc/qmake.conf +qt4/mkspecs/blackberry-playbook-x86-qcc/qplatformdefs.h qt4/mkspecs/blackberry-x86-qcc/qmake.conf qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h qt4/mkspecs/common/aix/qplatformdefs.h diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common index 45d9d552833..9ef7e045758 100644 --- a/x11/qt4/Makefile.common +++ b/x11/qt4/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.31 2012/12/07 10:06:13 adam Exp $ +# $NetBSD: Makefile.common,v 1.32 2013/07/07 18:14:36 adam Exp $ # used by x11/qt4-libs/Makefile.common # used by x11/qt4-tools/Makefile -QTVERSION= 4.8.4 +QTVERSION= 4.8.5 MAINTAINER?= pkgsrc-users@NetBSD.org -HOMEPAGE= http://qt.digia.com/ +HOMEPAGE= http://qt-project.org/ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3 |