diff options
Diffstat (limited to 'x11')
54 files changed, 399 insertions, 254 deletions
diff --git a/x11/qt5-dbus/Makefile b/x11/qt5-dbus/Makefile index 153f3da4da2..fffcff21782 100644 --- a/x11/qt5-dbus/Makefile +++ b/x11/qt5-dbus/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-dbus-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 DBus support plugin .include "../../x11/qt5-qtbase/Makefile.common" diff --git a/x11/qt5-dbus/PLIST b/x11/qt5-dbus/PLIST index 56bade94e2f..d4c0dff0ea5 100644 --- a/x11/qt5-dbus/PLIST +++ b/x11/qt5-dbus/PLIST @@ -1,22 +1,22 @@ -@comment $NetBSD: PLIST,v 1.1 2013/12/13 14:38:34 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/04/23 07:05:31 adam Exp $ lib/pkgconfig/Qt5DBus.pc -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbus_symbols_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusabstractadaptor_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusabstractinterface_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusargument_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusconnection_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusconnectionmanager_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbuscontext_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusintegrator_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusinterface_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusintrospection_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusmessage_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusmetaobject_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusmetatype_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbuspendingcall_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusthreaddebug_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusutil_p.h -qt5/include/QtDBus/5.2.0/QtDBus/private/qdbusxmlparser_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractinterface_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusargument_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnection_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnectionmanager_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuscontext_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintegrator_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusinterface_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintrospection_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmessage_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetaobject_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetatype_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuspendingcall_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusthreaddebug_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusutil_p.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusxmlparser_p.h qt5/include/QtDBus/QDBusAbstractAdaptor qt5/include/QtDBus/QDBusAbstractInterface qt5/include/QtDBus/QDBusAbstractInterfaceBase diff --git a/x11/qt5-mysql/Makefile b/x11/qt5-mysql/Makefile index 7fb433abd45..076115074cc 100644 --- a/x11/qt5-mysql/Makefile +++ b/x11/qt5-mysql/Makefile @@ -1,18 +1,16 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-mysql-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 MySQL plugin .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql -BUILD_DIRS+= qtbase/src/plugins/sqldrivers +BUILD_DIRS= qtbase/src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-odbc/Makefile b/x11/qt5-odbc/Makefile index bb9b75f0c3b..e7e07c7340e 100644 --- a/x11/qt5-odbc/Makefile +++ b/x11/qt5-odbc/Makefile @@ -1,20 +1,18 @@ -# $NetBSD: Makefile,v 1.6 2014/04/09 07:26:58 obache Exp $ +# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-odbc-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 odbc plugin .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CONFIGURE_ARGS+= -no-dbus CONFIGURE_ARGS+= -no-sql-mysql CONFIGURE_ARGS+= -no-sql-psql CONFIGURE_ARGS+= -no-sql-sqlite -BUILD_DIRS+= qtbase/src/plugins/sqldrivers +BUILD_DIRS= qtbase/src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-psql/Makefile b/x11/qt5-psql/Makefile index 13dd432b4e6..09bdc52f183 100644 --- a/x11/qt5-psql/Makefile +++ b/x11/qt5-psql/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-psql-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 PostgreSQL plugin .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib CONFIGURE_ARGS+= -no-dbus CONFIGURE_ARGS+= -no-sql-mysql @@ -16,7 +14,7 @@ CONFIGURE_ARGS+= -no-sql-sqlite BUILD_QT5= yes -BUILD_DIRS+= qtbase/src/plugins/sqldrivers +BUILD_DIRS= qtbase/src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -32,6 +30,6 @@ do-install: ${DESTDIR}${QTPREFIX}/plugins/sqldrivers .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../mk/pgsql.buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index be05e234cc6..04a135b5718 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2014/04/09 07:26:56 obache Exp $ +# $NetBSD: Makefile,v 1.8 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 6 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" -BUILD_DIRS+= qtbase +BUILD_DIRS= qtbase +BUILD_TARGET= sub-src PTHREAD_OPTS+= require UNLIMIT_RESOURCES= datasize @@ -26,6 +26,7 @@ CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaint/plugandpaint.pr CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro +CHECK_INTERPRETER_SKIP+= qt5/mkspecs/macx-ios-clang/rename_main.sh BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri @@ -35,8 +36,6 @@ PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ Qt5Widgets.pc Qt5Xml.pc -#pre-configure: remove-3rdparty-libs set-qmake-conf - post-configure: cd ${WRKSRC}/${BUILD_DIRS} && ./bin/qmake -o Makefile @@ -62,6 +61,7 @@ post-install: .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" @@ -77,6 +77,6 @@ post-install: .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" - +.endif .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index c7deaca38a9..dcdaa304660 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2014/01/28 08:46:14 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.10 2014/04/23 07:05:31 adam Exp $ # used by x11/qt5-dbus/Makefile # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile @@ -25,7 +25,7 @@ DISTNAME= qt-everywhere-opensource-src-${QTDISTVER} CATEGORIES= x11 -MASTER_SITES= http://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/ +MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTDISTVER:R}/${QTDISTVER}/single/ EXTRACT_SUFX= .tar.xz EXTRACT_USING= bsdtar @@ -37,9 +37,9 @@ FILESDIR= ${.CURDIR}/../../x11/qt5-qtbase/files PATCHDIR= ${.CURDIR}/../../x11/qt5-qtbase/patches .if defined(MAKE_JOBS) -.if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) +. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} -.endif +. endif .endif .include "../../mk/dlopen.buildlink3.mk" @@ -67,7 +67,6 @@ CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} CONFIGURE_ARGS+= -opensource -confirm-license CONFIGURE_ARGS+= -accessibility CONFIGURE_ARGS+= -fontconfig -CONFIGURE_ARGS+= -iconv CONFIGURE_ARGS+= -icu CONFIGURE_ARGS+= -openssl-linked CONFIGURE_ARGS+= -nomake examples @@ -87,13 +86,22 @@ OPSYSVARS+= CONFIGURE_ARGS .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} != "SunOS" +.if ${OPSYS} != "Darwin" +CONFIGURE_ARGS+= -iconv +. if ${OPSYS} != "SunOS" CONFIGURE_ARGS+= -reduce-relocations +. endif .endif MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} - +PLIST_VARS+= mac unix +.if ${OPSYS} == "Darwin" +PLIST.mac= yes +QMAKE_CONF= qmake.conf.mac +.else +PLIST.unix= yes QMAKE_CONF= qmake.conf +.endif # avoid creating a .qt directory in the users home directory SCRIPTS_ENV+= HOME=${WRKDIR} @@ -115,7 +123,7 @@ CONFIGURE_ARGS+= -platform solaris-cc . endif . endif SYS_LIBS= -lresolv -lsocket -lnsl -lrt -BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections +BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections .elif ${OPSYS} == "Interix" CONFIGURE_ARGS+= -platform interix-g++ CFLAGS+= -I/usr/local/include/bind @@ -125,12 +133,7 @@ SYS_LIBS= -lbind -ldb -ldl .elif ${OPSYS} == "DragonFly" CONFIGURE_ARGS+= -platform freebsd-g++ .elif ${OPSYS} == "Darwin" -. if !empty(PKGSRC_COMPILER:Mclang) -CONFIGURE_ARGS+= -platform macx-llvm -. else -CONFIGURE_ARGS+= -platform macx-g++ -. endif -CONFIGURE_ARGS+= -no-dwarf2 +CONFIGURE_ARGS+= -platform macx-clang CONFIGURE_ARGS+= -no-framework . if exists(/usr/lib/libresolv.dylib) LDFLAGS+= -lresolv @@ -140,9 +143,8 @@ LDFLAGS+= -ldl .endif remove-3rdparty-libs: -.for i in freetype libjpeg libpng zlib xcb - cd ${WRKSRC}/qtbase/src/3rdparty && \ - ${RM} -fr ${i} +.for i in freetype libjpeg libpng xcb zlib + ${RM} -f -r ${WRKSRC}/qtbase/src/3rdparty/${i} .endfor set-qmake-conf: @@ -170,10 +172,11 @@ set-qmake-conf: cp ${WRKSRC}/qmake.conf $${dir}; \ rm -f $${dir}/*.orig; \ done + ${RM} -f ${WRKSRC}/qtbase/mkspecs/features/mac/default_pre.prf + ${RM} -f ${WRKSRC}/qtbase/mkspecs/features/mac/objective_c.prf.orig no-qmake-build: - cd ${WRKSRC} && \ - ${PATCH} < ${FILESDIR}/patch-qtbase_configure.no-qmake + cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-qtbase_configure.no-qmake ${LN} -sf ${QTPREFIX}/bin/moc ${WRKSRC}/qtbase/bin/moc ${LN} -sf ${QTPREFIX}/bin/qmake ${WRKSRC}/qtbase/bin/qmake ${LN} -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/qtbase/bin/rcc @@ -193,6 +196,7 @@ post-configure: ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${QTPREFIX}/bin/qmake -o Makefile .endif +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 39a77d5b64b..3ab111c2666 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/04/23 07:05:31 adam Exp $ lib/pkgconfig/Qt5Bootstrap.pc lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc @@ -398,7 +398,6 @@ qt5/include/QtCore/QMutableVectorIterator qt5/include/QtCore/QMutex qt5/include/QtCore/QMutexLocker qt5/include/QtCore/QNoDebug -qt5/include/QtCore/QNoImplicitBoolCast qt5/include/QtCore/QObject qt5/include/QtCore/QObjectCleanupHandler qt5/include/QtCore/QObjectData @@ -741,7 +740,6 @@ qt5/include/QtCore/qwaitcondition.h qt5/include/QtCore/qwineventnotifier.h qt5/include/QtCore/qxmlstream.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstracttextdocumentlayout_p.h -qt5/include/QtGui/${PKGVERSION}/QtGui/private/qaccessible2_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qaccessiblecache_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qbezier_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qblendfunctions_p.h @@ -1629,7 +1627,6 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasickeyeventtransition_p qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbasicmouseeventtransition_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qbsptree_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcalendartextnavigator_p.h -qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcocoatoolbardelegate_mac_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolordialog_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnview_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qcolumnviewgrip_p.h @@ -2147,14 +2144,16 @@ qt5/lib/cmake/Qt5Core/Qt5CoreMacros.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake -qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake +${PLIST.mac}qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake qt5/lib/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake qt5/lib/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake qt5/lib/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake @@ -2346,7 +2345,6 @@ qt5/mkspecs/features/java.prf qt5/mkspecs/features/lex.prf qt5/mkspecs/features/link_pkgconfig.prf qt5/mkspecs/features/mac/default_post.prf -qt5/mkspecs/features/mac/default_pre.prf qt5/mkspecs/features/mac/objective_c.prf qt5/mkspecs/features/mac/rez.prf qt5/mkspecs/features/mac/sdk.prf @@ -2462,6 +2460,8 @@ qt5/mkspecs/irix-g++/qmake.conf qt5/mkspecs/irix-g++/qplatformdefs.h qt5/mkspecs/linux-arm-gnueabi-g++/qmake.conf qt5/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h +qt5/mkspecs/linux-clang-libc++/qmake.conf +qt5/mkspecs/linux-clang-libc++/qplatformdefs.h qt5/mkspecs/linux-clang/qmake.conf qt5/mkspecs/linux-clang/qplatformdefs.h qt5/mkspecs/linux-cxx/qmake.conf @@ -2527,6 +2527,7 @@ qt5/mkspecs/macx-ios-clang/features/qt.prf qt5/mkspecs/macx-ios-clang/features/qt_config.prf qt5/mkspecs/macx-ios-clang/qmake.conf qt5/mkspecs/macx-ios-clang/qplatformdefs.h +qt5/mkspecs/macx-ios-clang/rename_main.sh qt5/mkspecs/macx-llvm/Info.plist.app qt5/mkspecs/macx-llvm/Info.plist.lib qt5/mkspecs/macx-llvm/qmake.conf @@ -2654,11 +2655,14 @@ qt5/mkspecs/winrt-x64-msvc2012/qplatformdefs.h qt5/mkspecs/winrt-x86-msvc2012/qmake.conf qt5/mkspecs/winrt-x86-msvc2012/qplatformdefs.h qt5/plugins/accessible/libqtaccessiblewidgets.la +${PLIST.mac}qt5/plugins/bearer/libqcorewlanbearer.la qt5/plugins/bearer/libqgenericbearer.la qt5/plugins/imageformats/libqgif.la qt5/plugins/imageformats/libqico.la qt5/plugins/imageformats/libqjpeg.la -qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la +${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la +${PLIST.mac}qt5/plugins/platforms/libqcocoa.la qt5/plugins/platforms/libqminimal.la qt5/plugins/platforms/libqoffscreen.la -qt5/plugins/platforms/libqxcb.la +${PLIST.unix}qt5/plugins/platforms/libqxcb.la +${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk index 3d69b0f1aeb..187bd4b167b 100644 --- a/x11/qt5-qtbase/buildlink3.mk +++ b/x11/qt5-qtbase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:56 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:31 adam Exp $ BUILDLINK_TREE+= qt5-qtbase @@ -17,8 +17,15 @@ QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 PTHREAD_OPTS+= require +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" +.if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" @@ -33,12 +40,7 @@ PTHREAD_OPTS+= require .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libxkbcommon/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../textproc/icu/buildlink3.mk" +.endif .endif # QT5_QTBASE_BUILDLINK3_MK BUILDLINK_TREE+= -qt5-qtbase diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index 14852086bc1..e688fb6b132 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.8 2014/02/09 17:19:14 wiedi Exp $ +$NetBSD: distinfo,v 1.9 2014/04/23 07:05:31 adam Exp $ -SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4 -RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d -Size (qt-everywhere-opensource-src-5.2.0.tar.xz) = 173962448 bytes +SHA1 (qt-everywhere-opensource-src-5.2.1.tar.xz) = cc68265c62321670bd40e29bdd484ea881bd6af3 +RMD160 (qt-everywhere-opensource-src-5.2.1.tar.xz) = 9b716c5875a6186968392896ac8bd3261fae9b24 +Size (qt-everywhere-opensource-src-5.2.1.tar.xz) = 174004404 bytes SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57 -SHA1 (patch-qtbase_configure) = 06cbb2dc9433bbb890fa5a49e161798b6847af41 +SHA1 (patch-qtbase_configure) = bc00f5f7ea40c7304b9cf836748e1bad6f98526a +SHA1 (patch-qtbase_mkspecs_features_mac_objective__c.prf) = 40d56c675deabea27cdb9eae91d1e90b0f8348ad SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883 SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4 @@ -15,8 +16,7 @@ SHA1 (patch-qtbase_src_corelib_arch_sparc_arch.pri) = 0af37348671d681cbfc5033dfe SHA1 (patch-qtbase_src_corelib_codecs_qiconvcodec.cpp) = ba42bd582adb9ffca218152f4201120801cb1c98 SHA1 (patch-qtbase_src_corelib_global_qsystemdetection.h) = 9b4a18f59bd4ce2401ccbffe9db597674feb0686 SHA1 (patch-qtbase_src_corelib_io_io.pri) = 3cdaa27a60710a56739781dc996a5325007e32f9 -SHA1 (patch-qtbase_src_corelib_io_qfileselector.cpp) = 921476e586e90c875cf7686f3b3ee70a958505fc -SHA1 (patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp) = 1d7089c5a1902c31696e584e3498cc722876ca1e +SHA1 (patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp) = 28af6bc44dbb02d5773e44e37e5a1c58bdf6fffc SHA1 (patch-qtbase_src_corelib_io_qsettings.cpp) = c52e8c457431dc7c37ee8b9225591cd05e91f639 SHA1 (patch-qtbase_src_dbus_qdbusintegrator.cpp) = 6d178269350dab993383dfa2490119115e489e15 SHA1 (patch-qtbase_src_network_kernel_qhostinfo__unix.cpp) = 01ceb308e8d595e26b988ff335187452025e0648 @@ -26,13 +26,13 @@ SHA1 (patch-qtbase_src_plugins_platforminputcontexts_compose_generator_qtablegen SHA1 (patch-qtbase_src_tools_bootstrap_bootstrap.pro) = 24f47fcf6bab2ddca855a77113a0681dec063ca8 SHA1 (patch-qtbase_src_tools_moc_main.cpp) = 31f42b1625ec7a978e21ad3fdde67ce3328df425 SHA1 (patch-qtbase_src_widgets_graphicsview_qgraphicsitem__p.h) = a30402585f0b7efd9fc0dcd256e410a92dffff2c -SHA1 (patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro) = 6226874e7a32d5172abbd2579a4c263c4e8a2d30 +SHA1 (patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro) = 729e57819a0477c2bb06015b3bd106e1f972eb51 SHA1 (patch-qtbase_tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = ec68f41ccdc622eb5457ea7a3c37c1f54058b595 SHA1 (patch-qtdeclarative_examples_quick_customitems_painteditem_painteditem.pro) = 4eb38df598145da3bb8272dfc4c34649d54cf9fe SHA1 (patch-qtdeclarative_src_qml_jsruntime_qv4alloca__p.h) = 9a1a4bb03776e3e6331120933accd0cf46503533 SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998 -SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 9281d212f28dab5fece2f7a0cc9bddf0e58922dc +SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 122c629340578670876571e10c5946c4f359ed04 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8 SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 4c5f0d3d5a0c6b3075232272abe00b467575194f @@ -49,6 +49,7 @@ SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCache SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94 SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98 SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e +SHA1 (patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h) = 80862b28ebbb2182be96da16853903a48c0bc610 SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c SHA1 (patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri) = 0ce44b200616417357efc6495274c3a682bcd44b SHA1 (patch-qtwebkit_Source_JavaScriptCore_Target.pri) = 5c86d2733e8288e6ec9bea61907f917953adfc5c @@ -79,8 +80,11 @@ SHA1 (patch-qtwebkit_Source_WebCore_editing_Editor.h) = ac37cddf5a34233ac12c41d3 SHA1 (patch-qtwebkit_Source_WebCore_page_NavigatorBase.cpp) = 29c3821bc93967eadb808177f3c3deddb5065eb3 SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = 30cc1874c67834ee31109c7de838ae91bc2cbe61 SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 08e5ac6d67fb66f80072877cd4eaa1ade94067cc +SHA1 (patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp) = be8e1ab3ed5af934a3f38cd2fabe73249813422f SHA1 (patch-qtwebkit_Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 6432882b26fb2a1a2e855286905e5d54db82b74f SHA1 (patch-qtwebkit_Source_WebKit2_DerivedSources.pri) = eb3306cb14e53b6e1712cf95fbc8dadaaee31745 +SHA1 (patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp) = 4e0589307055cb2cb35465c92f596c5a5d0ace06 +SHA1 (patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h) = 3690a35eb8defb1a746bcde790c8cca050b4faea SHA1 (patch-qtwebkit_Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = fb5b89c138c061ea9caf05b6d7060db87b713db5 SHA1 (patch-qtwebkit_Source_WebKit2_Target.pri) = 80bcb27c5f3f168227741fd68b9e67fc0b613eb4 SHA1 (patch-qtwebkit_Source_WebKit_WebKit1.pro) = 70282ebe8ff4524389fe523063d4d00eef21158e diff --git a/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake b/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake index 907e458ebc4..fec3f1efef8 100644 --- a/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake +++ b/x11/qt5-qtbase/files/patch-qtbase_configure.no-qmake @@ -1,8 +1,8 @@ -$NetBSD: patch-qtbase_configure.no-qmake,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qtbase_configure.no-qmake,v 1.2 2014/04/23 07:05:31 adam Exp $ --- qtbase/configure.orig 2013-11-29 09:43:56.000000000 +0000 +++ qtbase/configure -@@ -3972,8 +3972,8 @@ setBootstrapVariable() +@@ -3889,8 +3889,8 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } diff --git a/x11/qt5-qtbase/files/qmake.conf b/x11/qt5-qtbase/files/qmake.conf index cde2f8bfaa7..2633201dd4c 100644 --- a/x11/qt5-qtbase/files/qmake.conf +++ b/x11/qt5-qtbase/files/qmake.conf @@ -3,14 +3,12 @@ # MAKEFILE_GENERATOR = UNIX -#QMAKE_PLATFORM = netbsd bsd -QMAKE_PLATFORM = unix posix +QMAKE_PLATFORM = unix CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index CONFIG += compile_libtool -CONFIG += explicitlib QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_COMPILER = @CC@ +QMAKE_COMPILER = @CC@ QMAKE_CC = @CC@ QMAKE_LEX = @LEX@ @@ -21,7 +19,7 @@ QMAKE_CFLAGS = @CFLAGS@ QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 +QMAKE_CFLAGS_RELEASE = QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_APP = -fPIE @@ -84,15 +82,6 @@ QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_UIC3 = $(QTDIR)/bin/uic3 QMAKE_RCC = $(QTDIR)/bin/rcc -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $$QMAKE_COPY -QMAKE_COPY_DIR = $$QMAKE_COPY -R -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = @MKDIR@ diff --git a/x11/qt5-qtbase/files/qmake.conf.mac b/x11/qt5-qtbase/files/qmake.conf.mac new file mode 100644 index 00000000000..f0d8d82279e --- /dev/null +++ b/x11/qt5-qtbase/files/qmake.conf.mac @@ -0,0 +1,98 @@ +# +# qmake configuration for pkgsrc +# + +MAKEFILE_GENERATOR = UNIX +QMAKE_PLATFORM = darwin mac macx osx +CONFIG += qt warn_on release link_prl incremental global_init_link_order lib_version_first plugin_no_soname +CONFIG += compile_libtool +QMAKE_INCREMENTAL_STYLE = sublib + +QMAKE_COMPILER = @CC@ +QMAKE_COMPILER_DEFINES = __APPLE__ __GNUC__ + +QMAKE_CC = @CC@ +QMAKE_LEX = @LEX@ +QMAKE_LEXFLAGS = +QMAKE_YACC = @YACC@ +QMAKE_YACCFLAGS = -d +QMAKE_CFLAGS = @CFLAGS@ +QMAKE_CFLAGS_DEPS = -M +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = -w +QMAKE_CFLAGS_RELEASE = +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_APP = -fPIE +QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_REENTRANT + +QMAKE_CXX = @CXX@ +QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_APP = $$QMAKE_CFLAGS_APP +QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +QMAKE_CXXFLAGS_CXX11 = -std=c++0x + +QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS +QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS + +QMAKE_INCDIR = @LOCALBASE@/include +QMAKE_LIBDIR = @LOCALBASE@/lib +#QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ +# /System/Library/Frameworks/AGL.framework/Headers/ + +QMAKE_LINK = @CXX@ +QMAKE_LINK_SHLIB = @CXX@ +QMAKE_LINK_C = @CC@ +QMAKE_LINK_C_SHLIB = @CC@ +QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) +QMAKE_LFLAGS = @LDFLAGS@ +QMAKE_LFLAGS_RELEASE = -framework Foundation +eMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -single_module -dynamiclib +QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE} +QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@ +QMAKE_LFLAGS_RPATH = +QMAKE_LFLAGS_INCREMENTAL= -undefined suppress -flat_namespace +QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} +QMAKE_LFLAGS_COMPAT_VERSION=-compatibility_version$${LITERAL_WHITESPACE} +# -all_load required to make Objective-C categories work in static builds. +QMAKE_LFLAGS_STATIC_LIB = -all_load + +QMAKE_FIX_RPATH = install_name_tool -id +QMAKE_EXTENSION_SHLIB = dylib + +QMAKE_LIBS = +QMAKE_LFLAGS_RPATH = +QMAKE_LIBS_DYNLOAD = +QMAKE_LIBS_THREAD = +QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL + +QMAKE_AR = @AR@ cq +QMAKE_NM = nm -P +QMAKE_RANLIB = @QMAKE_RANLIB@ + +QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_UIC3 = $(QTDIR)/bin/uic3 +QMAKE_RCC = $(QTDIR)/bin/rcc + +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = @MKDIR@ + +include(../common/unix.conf) +load(qt_config) diff --git a/x11/qt5-qtbase/patches/patch-qtbase_configure b/x11/qt5-qtbase/patches/patch-qtbase_configure index 7d20dabeabb..fc38d28b0b4 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_configure +++ b/x11/qt5-qtbase/patches/patch-qtbase_configure @@ -1,10 +1,27 @@ -$NetBSD: patch-qtbase_configure,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qtbase_configure,v 1.2 2014/04/23 07:05:31 adam Exp $ +* Don't use SDKs on OS X * Add NetBSD/sparc{,64} support ---- qtbase/configure.orig 2013-11-27 01:00:28.000000000 +0000 +--- qtbase/configure.orig 2014-02-01 20:37:23.000000000 +0000 +++ qtbase/configure -@@ -2663,6 +2663,19 @@ if [ -z "$PLATFORM" ]; then +@@ -319,7 +319,6 @@ getQMakeConf() + { + if [ -z "$specvals" ]; then + specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"` +- if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi + fi + getSingleQMakeVariable "$1" "$specvals" + } +@@ -328,7 +327,6 @@ getXQMakeConf() + { + if [ -z "$xspecvals" ]; then + xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"` +- if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi + fi + getSingleQMakeVariable "$1" "$xspecvals" + } +@@ -2679,6 +2677,19 @@ if [ -z "$PLATFORM" ]; then UNIX_SV:*) PLATFORM=unixware-g++ ;; @@ -24,7 +41,7 @@ $NetBSD: patch-qtbase_configure,v 1.1 2013/12/13 14:38:35 ryoon Exp $ QNX:*) PLATFORM=unsupported/qnx-g++ ;; -@@ -6230,7 +6243,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" +@@ -6263,7 +6274,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" diff --git a/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_mac_objective__c.prf b/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_mac_objective__c.prf new file mode 100644 index 00000000000..73e2a3de03c --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtbase_mkspecs_features_mac_objective__c.prf @@ -0,0 +1,17 @@ +$NetBSD: patch-qtbase_mkspecs_features_mac_objective__c.prf,v 1.1 2014/04/23 07:05:31 adam Exp $ + +Use LIBTOOL for objective-c sources. + +--- qtbase/mkspecs/features/mac/objective_c.prf.orig 2014-02-01 20:37:37.000000000 +0000 ++++ qtbase/mkspecs/features/mac/objective_c.prf +@@ -15,8 +15,8 @@ isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT + + objective_c.dependency_type = TYPE_C + objective_c.variables = QMAKE_OBJECTIVE_CFLAGS +-objective_c.commands = $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} +-objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} ++objective_c.commands = $(LIBTOOL) --mode=compile $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo ++objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo + objective_c.input = OBJECTIVE_SOURCES + objective_c.name = Compile ${QMAKE_FILE_IN} + silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfileselector.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfileselector.cpp deleted file mode 100644 index e565be27a0d..00000000000 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfileselector.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-qtbase_src_corelib_io_qfileselector.cpp,v 1.2 2013/12/30 11:49:48 jperkin Exp $ - -* NetBSD and SunOS need sys/utsname.h for uname(3) - ---- qtbase/src/corelib/io/qfileselector.cpp.orig 2013-11-27 01:01:16.000000000 +0000 -+++ qtbase/src/corelib/io/qfileselector.cpp -@@ -51,6 +51,10 @@ - #include <QtCore/QLocale> - #include <QtCore/QDebug> - -+#if defined(Q_OS_NETBSD) || defined(Q_OS_SOLARIS) -+#include <sys/utsname.h> -+#endif -+ - QT_BEGIN_NAMESPACE - - //Environment variable to allow tooling full control of file selectors diff --git a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp index 395e49b3d61..e152afaeb38 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp +++ b/x11/qt5-qtbase/patches/patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp,v 1.2 2014/04/23 07:05:31 adam Exp $ * Add NetBSD support ---- qtbase/src/corelib/io/qfilesystemwatcher.cpp.orig 2013-11-27 01:01:16.000000000 +0000 +--- qtbase/src/corelib/io/qfilesystemwatcher.cpp.orig 2014-02-01 20:37:36.000000000 +0000 +++ qtbase/src/corelib/io/qfilesystemwatcher.cpp @@ -60,7 +60,7 @@ # include "qfilesystemwatcher_win_p.h" @@ -21,4 +21,4 @@ $NetBSD: patch-qtbase_src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2013/12/13 14: +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD) return QKqueueFileSystemWatcherEngine::create(parent); #else - return 0; + Q_UNUSED(parent); diff --git a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro b/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro index 95494dc5985..59499f50c8e 100644 --- a/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro +++ b/x11/qt5-qtbase/patches/patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro @@ -1,8 +1,8 @@ -$NetBSD: patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro,v 1.1 2013/12/13 14:38:35 ryoon Exp $ +$NetBSD: patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro,v 1.2 2014/04/23 07:05:31 adam Exp $ * Pass whitespace(s) in filename test cases. ---- qtbase/tests/auto/corelib/io/qprocess/qprocess.pro.orig 2013-11-27 01:01:09.000000000 +0000 +--- qtbase/tests/auto/corelib/io/qprocess/qprocess.pro.orig 2014-02-01 20:37:28.000000000 +0000 +++ qtbase/tests/auto/corelib/io/qprocess/qprocess.pro @@ -3,10 +3,7 @@ TEMPLATE = subdirs include(qprocess.pri) @@ -14,5 +14,5 @@ $NetBSD: patch-qtbase_tests_auto_corelib_io_qprocess_qprocess.pro,v 1.1 2013/12/ - testSpaceInName +SUBDIRS += testProcessSpacesArgs/nospace.pro - win32:!wince*:SUBDIRS+=testProcessEchoGui - + win32:!wince* { + SUBDIRS += \ diff --git a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp index f51f05d4fb1..e4753c5bf68 100644 --- a/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp +++ b/x11/qt5-qtbase/patches/patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.1 2013/12/30 06:37:11 ryoon Exp $ +$NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v 1.2 2014/04/23 07:05:31 adam Exp $ ---- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2013-12-20 09:05:17.000000000 +0000 +--- qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp.orig 2014-02-01 20:37:58.000000000 +0000 +++ qtmultimedia/src/gsttools/qgstreamervideoinputdevicecontrol.cpp @@ -44,7 +44,12 @@ #include <QtCore/QDir> @@ -22,4 +22,4 @@ $NetBSD: patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp,v -#include <linux/videodev2.h> QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) - :QVideoDeviceSelectorControl(parent), m_selectedDevice(0) + :QVideoDeviceSelectorControl(parent), m_source(0), m_selectedDevice(0) diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h new file mode 100644 index 00000000000..7f57d5681f0 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h @@ -0,0 +1,13 @@ +$NetBSD: patch-qtwebkit_Source_JavaScriptCore_API_ObjCCallbackFunction.h,v 1.1 2014/04/23 07:05:31 adam Exp $ + +--- qtwebkit/Source/JavaScriptCore/API/ObjCCallbackFunction.h.orig 2014-04-21 21:08:37.000000000 +0000 ++++ qtwebkit/Source/JavaScriptCore/API/ObjCCallbackFunction.h +@@ -29,7 +29,7 @@ + + #if JSC_OBJC_API_ENABLED + +-#import <JavaScriptCore/JSCallbackFunction.h> ++#import <JavaScriptCore/API/JSCallbackFunction.h> + + #if defined(__OBJC__) + JSObjectRef objCCallbackFunctionForMethod(JSContext *, Class, Protocol *, BOOL isInstanceMethod, SEL, const char* types); diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp new file mode 100644 index 00000000000..a19a4313fcd --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-qtwebkit_Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp,v 1.1 2014/04/23 07:05:31 adam Exp $ + +Correct includes. + +--- qtwebkit/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp.orig 2014-04-22 06:24:40.000000000 +0000 ++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp +@@ -23,9 +23,9 @@ + #if USE(GRAPHICS_SURFACE) && OS(DARWIN) + #include "TextureMapperGL.h" + #include <CoreFoundation/CFNumber.h> +-#include <CGLContext.h> +-#include <CGLCurrent.h> +-#include <CGLIOSurface.h> ++#include <OpenGL/CGLContext.h> ++#include <OpenGL/CGLCurrent.h> ++#include <OpenGL/CGLIOSurface.h> + #include <IOSurface/IOSurface.h> + #include <OpenGL/OpenGL.h> + #include <OpenGL/gl.h> diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp new file mode 100644 index 00000000000..3196a0a9845 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.cpp,v 1.1 2014/04/23 07:05:31 adam Exp $ + +--- qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp.orig 2014-04-22 06:58:04.000000000 +0000 ++++ qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp +@@ -31,7 +31,7 @@ + #include "MessageFlags.h" + #include "StringReference.h" + +-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 ++#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + #include "ImportanceAssertion.h" + #endif + +@@ -77,7 +77,7 @@ bool MessageDecoder::shouldDispatchMessa + return m_messageFlags & DispatchMessageWhenWaitingForSyncReply; + } + +-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 ++#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + void MessageDecoder::setImportanceAssertion(PassOwnPtr<ImportanceAssertion> assertion) + { + m_importanceAssertion = assertion; diff --git a/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h new file mode 100644 index 00000000000..ca6ad691f10 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h @@ -0,0 +1,22 @@ +$NetBSD: patch-qtwebkit_Source_WebKit2_Platform_CoreIPC_MessageDecoder.h,v 1.1 2014/04/23 07:05:31 adam Exp $ + +--- qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.h.orig 2014-04-22 06:56:09.000000000 +0000 ++++ qtwebkit/Source/WebKit2/Platform/CoreIPC/MessageDecoder.h +@@ -46,7 +46,7 @@ public: + bool isSyncMessage() const; + bool shouldDispatchMessageWhenWaitingForSyncReply() const; + +-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 ++#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + void setImportanceAssertion(PassOwnPtr<ImportanceAssertion>); + #endif + +@@ -57,7 +57,7 @@ private: + StringReference m_messageReceiverName; + StringReference m_messageName; + +-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 ++#if defined(Q_OS_MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 + OwnPtr<ImportanceAssertion> m_importanceAssertion; + #endif + }; diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile index dd1feca6028..bdc43952bce 100644 --- a/x11/qt5-qtdeclarative/Makefile +++ b/x11/qt5-qtdeclarative/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-qtdeclarative-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for declarative framework .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtdeclarative - +BUILD_DIRS= qtdeclarative +BUILD_TARGET= sub-tools INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -31,7 +29,6 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST index 88975e3ddc2..758b1b5461d 100644 --- a/x11/qt5-qtdeclarative/PLIST +++ b/x11/qt5-qtdeclarative/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/04/23 07:05:31 adam Exp $ lib/pkgconfig/Qt5Qml.pc lib/pkgconfig/Qt5QmlDevTools.pc lib/pkgconfig/Qt5Quick.pc @@ -290,6 +290,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickdroparea_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickevents_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickable_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickable_p_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickablebehavior_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflipable_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfocusscope_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontloader_p.h diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk index 3394e9caf58..b72f5468752 100644 --- a/x11/qt5-qtdeclarative/buildlink3.mk +++ b/x11/qt5-qtdeclarative/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:31 adam Exp $ BUILDLINK_TREE+= qt5-qtdeclarative @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include BUILDLINK_LIBDIRS.qt5-qtdeclarative+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtdeclarative+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .endif # QT5_QTDECLARATIVE_BUILDLINK3_MK diff --git a/x11/qt5-qtdoc/Makefile b/x11/qt5-qtdoc/Makefile index ec0a0d1e868..7c4e02b7b15 100644 --- a/x11/qt5-qtdoc/Makefile +++ b/x11/qt5-qtdoc/Makefile @@ -1,22 +1,19 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:31 adam Exp $ .include "../../x11/qt5-qtbase/Makefile.common" PKGNAME= qt5-qtdoc-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 documentations USE_LIBTOOL= yes MAKE_ENV+= QTDIR=${QTDIR} -BUILD_DIRS+= qtdoc - -INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} - +BUILD_DIRS= qtdoc BUILD_TARGET= docs INSTALL_TARGET= install_docs -.include "../../x11/qt5-qtbase/buildlink3.mk" +INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} + .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtgraphicaleffects/Makefile b/x11/qt5-qtgraphicaleffects/Makefile index cef2a7430dd..022585eaa41 100644 --- a/x11/qt5-qtgraphicaleffects/Makefile +++ b/x11/qt5-qtgraphicaleffects/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:27:19 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:31 adam Exp $ PKGNAME= qt5-qtgraphicaleffects-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for Graphics effects .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtgraphicaleffects +BUILD_DIRS= qtgraphicaleffects MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qtimageformats/Makefile b/x11/qt5-qtimageformats/Makefile index 77bff79ec9d..425c3a59dc1 100644 --- a/x11/qt5-qtimageformats/Makefile +++ b/x11/qt5-qtimageformats/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ .include "../../x11/qt5-qtbase/Makefile.common" PKGNAME= qt5-qtimageformats-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for Image formats USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtimageformats +BUILD_DIRS= qtimageformats +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile index 5763c451021..b18a9a786d0 100644 --- a/x11/qt5-qtlocation/Makefile +++ b/x11/qt5-qtlocation/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtlocation-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for qtlocation .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib BUILD_DIRS+= qtlocation +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -25,6 +24,5 @@ post-install: ${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtlocation/buildlink3.mk b/x11/qt5-qtlocation/buildlink3.mk index 0857c4a303f..4b39b073755 100644 --- a/x11/qt5-qtlocation/buildlink3.mk +++ b/x11/qt5-qtlocation/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtlocation @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtlocation+= qt5/include BUILDLINK_LIBDIRS.qt5-qtlocation+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtlocation+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .endif # QT5_QTLOCATION_BUILDLINK3_MK diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile index 1a1223a6681..489fa31b534 100644 --- a/x11/qt5-qtmultimedia/Makefile +++ b/x11/qt5-qtmultimedia/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $ .include "../../x11/qt5-qtbase/Makefile.common" PKGNAME= qt5-qtmultimedia-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 module for multimedia USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtmultimedia +BUILD_DIRS= qtmultimedia +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -23,9 +22,10 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../audio/pulseaudio/buildlink3.mk" +.if ${OPSYS} != "Darwin" .include "../../audio/openal/buildlink3.mk" +.include "../../audio/pulseaudio/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" +.endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST index 0637d02183e..6b4fa9cf281 100644 --- a/x11/qt5-qtmultimedia/PLIST +++ b/x11/qt5-qtmultimedia/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/12/30 06:37:11 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/04/23 07:05:32 adam Exp $ lib/pkgconfig/Qt5Multimedia.pc lib/pkgconfig/Qt5MultimediaQuick_p.pc lib/pkgconfig/Qt5MultimediaWidgets.pc @@ -253,8 +253,8 @@ qt5/lib/libQt5MultimediaQuick_p.la qt5/lib/libQt5MultimediaQuick_p.prl qt5/lib/libQt5MultimediaWidgets.la qt5/lib/libQt5MultimediaWidgets.prl -qt5/lib/libqgsttools_p.la -qt5/lib/libqgsttools_p.prl +${PLIST.unix}qt5/lib/libqgsttools_p.la +${PLIST.unix}qt5/lib/libqgsttools_p.prl qt5/lib/pkgconfig/Qt5Multimedia.pc qt5/lib/pkgconfig/Qt5MultimediaQuick_p.pc qt5/lib/pkgconfig/Qt5MultimediaWidgets.pc @@ -263,10 +263,15 @@ qt5/mkspecs/modules/qt_lib_multimedia_private.pri qt5/mkspecs/modules/qt_lib_multimediawidgets.pri qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri -qt5/plugins/mediaservice/libgstaudiodecoder.la -qt5/plugins/mediaservice/libgstcamerabin.la -qt5/plugins/mediaservice/libgstmediacapture.la -qt5/plugins/mediaservice/libgstmediaplayer.la +${PLIST.mac}qt5/plugins/audio/libqtaudio_coreaudio.la +${PLIST.mac}qt5/plugins/mediaservice/libqavfcamera.la +${PLIST.mac}qt5/plugins/mediaservice/libqavfmediaplayer.la +${PLIST.mac}qt5/plugins/mediaservice/libqqt7engine.la +${PLIST.mac}qt5/plugins/mediaservice/libqtmedia_audioengine.la +${PLIST.unix}qt5/plugins/mediaservice/libgstaudiodecoder.la +${PLIST.unix}qt5/plugins/mediaservice/libgstcamerabin.la +${PLIST.unix}qt5/plugins/mediaservice/libgstmediacapture.la +${PLIST.unix}qt5/plugins/mediaservice/libgstmediaplayer.la qt5/plugins/playlistformats/libqtmultimedia_m3u.la qt5/qml/QtAudioEngine/libdeclarative_audioengine.la qt5/qml/QtAudioEngine/plugins.qmltypes diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk index 99989a08074..a1bef25111e 100644 --- a/x11/qt5-qtmultimedia/buildlink3.mk +++ b/x11/qt5-qtmultimedia/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/04/20 02:27:49 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtmultimedia @@ -13,10 +13,11 @@ BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/plugins -.include "../../audio/pulseaudio/buildlink3.mk" +.if ${OPSYS} != "Darwin" .include "../../audio/openal/buildlink3.mk" +.include "../../audio/pulseaudio/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" +.endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .endif # QT5_QTMULTIMEDIA_BUILDLINK3_MK diff --git a/x11/qt5-qtquick1/Makefile b/x11/qt5-qtquick1/Makefile index e5fbfdfaaa5..17b42c53be0 100644 --- a/x11/qt5-qtquick1/Makefile +++ b/x11/qt5-qtquick1/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtquick1-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 module for Quick1 .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtquick1 +BUILD_DIRS= qtquick1 MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -23,8 +21,6 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../x11/qt5-qtquick1/buildlink3.mk" .include "../../x11/qt5-qtscript/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" diff --git a/x11/qt5-qtquick1/buildlink3.mk b/x11/qt5-qtquick1/buildlink3.mk index ef72731df1e..d096c1ad046 100644 --- a/x11/qt5-qtquick1/buildlink3.mk +++ b/x11/qt5-qtquick1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtquick1 @@ -13,8 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtquick1+= qt5/include BUILDLINK_LIBDIRS.qt5-qtquick1+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtquick1+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../x11/qt5-qtquick1/buildlink3.mk" .include "../../x11/qt5-qtscript/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" diff --git a/x11/qt5-qtquickcontrols/Makefile b/x11/qt5-qtquickcontrols/Makefile index a3171c1cbe3..d10c5bbf4d4 100644 --- a/x11/qt5-qtquickcontrols/Makefile +++ b/x11/qt5-qtquickcontrols/Makefile @@ -1,20 +1,18 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:58 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ .include "../../x11/qt5-qtbase/Makefile.common" PKGNAME= qt5-qtquickcontrols-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for QuickControls USE_LIBTOOL= yes CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtquickcontrols +BUILD_DIRS= qtquickcontrols MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtquickcontrols/buildlink3.mk b/x11/qt5-qtquickcontrols/buildlink3.mk index 4030710b599..d16fe187153 100644 --- a/x11/qt5-qtquickcontrols/buildlink3.mk +++ b/x11/qt5-qtquickcontrols/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:58 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtquickcontrols @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtquickcontrols+= qt5/include BUILDLINK_LIBDIRS.qt5-qtquickcontrols+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtquickcontrols+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .endif # QT5_QTQUICKCONTROLS_BUILDLINK3_MK diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile index abc5e974fcb..448754ec764 100644 --- a/x11/qt5-qtscript/Makefile +++ b/x11/qt5-qtscript/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtscript-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 module for script .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtscript +BUILD_DIRS= qtscript +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -23,6 +22,5 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtsensors/Makefile b/x11/qt5-qtsensors/Makefile index a2fc5c14c83..44001508e3c 100644 --- a/x11/qt5-qtsensors/Makefile +++ b/x11/qt5-qtsensors/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.7 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtsensors-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for Sensors .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtsensors +BUILD_DIRS= qtsensors MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -23,7 +21,6 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtsensors/buildlink3.mk b/x11/qt5-qtsensors/buildlink3.mk index f002ed5b54a..9a511e59797 100644 --- a/x11/qt5-qtsensors/buildlink3.mk +++ b/x11/qt5-qtsensors/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtsensors @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtsensors+= qt5/include BUILDLINK_LIBDIRS.qt5-qtsensors+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtsensors+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .endif # QT5_QTSENSORS_BUILDLINK3_MK diff --git a/x11/qt5-qtserialport/Makefile b/x11/qt5-qtserialport/Makefile index a01b7481bb5..319d569ec37 100644 --- a/x11/qt5-qtserialport/Makefile +++ b/x11/qt5-qtserialport/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtserialport-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for Serial Port .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtserialport +BUILD_DIRS= qtserialport MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qtsvg/Makefile b/x11/qt5-qtsvg/Makefile index 337af529409..d9f3d93c41d 100644 --- a/x11/qt5-qtsvg/Makefile +++ b/x11/qt5-qtsvg/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ .include "../../x11/qt5-qtbase/Makefile.common" PKGNAME= qt5-qtsvg-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for SVG USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtsvg +BUILD_DIRS= qtsvg +BUILD_TARGET= sub-src MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5-qttools/Makefile b/x11/qt5-qttools/Makefile index fd6df203e63..58f351cdd29 100644 --- a/x11/qt5-qttools/Makefile +++ b/x11/qt5-qttools/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qttools-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 tools .include "../../x11/qt5-qtbase/Makefile.common" @@ -9,10 +8,9 @@ COMMENT= Qt5 tools DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qttools +BUILD_DIRS= qttools MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} @@ -37,7 +35,6 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-dbus/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" diff --git a/x11/qt5-qttools/buildlink3.mk b/x11/qt5-qttools/buildlink3.mk index 9ad2efac653..fab74a360eb 100644 --- a/x11/qt5-qttools/buildlink3.mk +++ b/x11/qt5-qttools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qttools @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qttools+= qt5/include BUILDLINK_LIBDIRS.qt5-qttools+= qt5/lib BUILDLINK_LIBDIRS.qt5-qttools+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-dbus/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" diff --git a/x11/qt5-qttranslations/Makefile b/x11/qt5-qttranslations/Makefile index fbddf5a5f53..8d0675f0c34 100644 --- a/x11/qt5-qttranslations/Makefile +++ b/x11/qt5-qttranslations/Makefile @@ -1,21 +1,18 @@ -# $NetBSD: Makefile,v 1.8 2014/04/20 02:27:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qttranslations-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 translations .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qttranslations +BUILD_DIRS= qttranslations MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index 51101d78cb8..aee5e17caa6 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtwebkit-${QTVERSION} -PKGREVISION= 8 COMMENT= Qt5 WebView module .include "../../x11/qt5-qtbase/Makefile.common" @@ -9,12 +8,11 @@ COMMENT= Qt5 WebView module BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf USE_LIBTOOL= yes +USE_TOOLS+= bison sed pkg-config -BUILD_DIRS+= qtwebkit +BUILD_DIRS= qtwebkit MAKE_ENV+= QTDIR=${QTDIR} -USE_TOOLS+= bison sed pkg-config - INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -50,15 +48,15 @@ post-install: .include "../../databases/sqlite3/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.if ${OPSYS} != "Darwin" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../x11/libXcomposite/buildlink3.mk" -.include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" +.endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../x11/qt5-qtlocation/buildlink3.mk" .include "../../x11/qt5-qtmultimedia/buildlink3.mk" diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk index dd7e3cdcc6f..9b74bef282c 100644 --- a/x11/qt5-qtwebkit/buildlink3.mk +++ b/x11/qt5-qtwebkit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2014/04/20 02:27:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtwebkit @@ -21,9 +21,9 @@ BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins .include "../../mk/jpeg.buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.if ${OPSYS} != "Darwin" .include "../../x11/libXcomposite/buildlink3.mk" -.include "../../x11/libXrender/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" +.endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .include "../../x11/qt5-qtlocation/buildlink3.mk" .include "../../x11/qt5-qtmultimedia/buildlink3.mk" diff --git a/x11/qt5-qtx11extras/Makefile b/x11/qt5-qtx11extras/Makefile index 086c16fc5d0..65e9eb664b7 100644 --- a/x11/qt5-qtx11extras/Makefile +++ b/x11/qt5-qtx11extras/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtx11extras-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for X11 extras .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtx11extras +BUILD_DIRS= qtx11extras INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig @@ -22,6 +20,5 @@ post-install: ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-qtx11extras/buildlink3.mk b/x11/qt5-qtx11extras/buildlink3.mk index aa0ea676787..37bd60887e3 100644 --- a/x11/qt5-qtx11extras/buildlink3.mk +++ b/x11/qt5-qtx11extras/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:32 adam Exp $ BUILDLINK_TREE+= qt5-qtx11extras @@ -13,7 +13,6 @@ BUILDLINK_INCDIRS.qt5-qtx11extras+= qt5/include BUILDLINK_LIBDIRS.qt5-qtx11extras+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtx11extras+= qt5/plugins -.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .endif # QT5_QTX11EXTRAS_BUILDLINK3_MK diff --git a/x11/qt5-qtxmlpatterns/Makefile b/x11/qt5-qtxmlpatterns/Makefile index 1f8488ad522..3c16c2dffdc 100644 --- a/x11/qt5-qtxmlpatterns/Makefile +++ b/x11/qt5-qtxmlpatterns/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:57 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-qtxmlpatterns-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for XML Patterns .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtxmlpatterns -#MAKE_ENV+= QTDIR=${QTDIR} +BUILD_DIRS= qtxmlpatterns +BUILD_TARGET= sub-tools INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} INSTALLATION_DIRS+= lib/pkgconfig diff --git a/x11/qt5-sqlite3/Makefile b/x11/qt5-sqlite3/Makefile index ec6e4f4f3ae..9d577eed998 100644 --- a/x11/qt5-sqlite3/Makefile +++ b/x11/qt5-sqlite3/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2014/04/09 07:26:58 obache Exp $ +# $NetBSD: Makefile,v 1.6 2014/04/23 07:05:32 adam Exp $ PKGNAME= qt5-sqlite3-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 SQLite3 plugin .include "../../x11/qt5-qtbase/Makefile.common" USE_LIBTOOL= yes - CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib -BUILD_DIRS+= qtbase/src/plugins/sqldrivers +BUILD_DIRS= qtbase/src/plugins/sqldrivers MAKE_ENV+= QTDIR=${QTDIR} INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile index 18330bc5a0b..be63d7f7bd3 100644 --- a/x11/qt5/Makefile +++ b/x11/qt5/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2014/02/12 23:18:55 tron Exp $ +# $NetBSD: Makefile,v 1.4 2014/04/23 07:05:31 adam Exp $ DISTNAME= qt5-${QTVERSION} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= # none diff --git a/x11/qt5/Makefile.common b/x11/qt5/Makefile.common index 6fefdabd77e..6aa2fd31e9d 100644 --- a/x11/qt5/Makefile.common +++ b/x11/qt5/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.2 2013/12/15 09:42:43 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.3 2014/04/23 07:05:31 adam Exp $ # used by x11/qt5-qtbase/Makefile.common # used by inputmethod/qt5-uim/Makefile -QTDISTVER= 5.2.0 +QTDISTVER= 5.2.1 QTVERSION= ${QTDISTVER:S/-rc/rc/} .include "../../mk/bsd.prefs.mk" |