diff options
122 files changed, 959 insertions, 1081 deletions
diff --git a/x11/qt5-dbus/DESCR b/x11/qt5-dbus/DESCR deleted file mode 100644 index 4cee2ef8f27..00000000000 --- a/x11/qt5-dbus/DESCR +++ /dev/null @@ -1 +0,0 @@ -Qt5 DBus support plugin diff --git a/x11/qt5-dbus/Makefile b/x11/qt5-dbus/Makefile deleted file mode 100644 index ceb1f8a1b55..00000000000 --- a/x11/qt5-dbus/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2015/10/10 01:57:57 ryoon Exp $ - -DISTNAME= qtbase-opensource-src-${QTVERSION} -PKGNAME= qt5-dbus-${QTVERSION} -PKGREVISION= 3 -COMMENT= Qt5 DBus support plugin - -BUILD_DIRS= src/dbus -BUILD_DIRS+= src/tools/qdbuscpp2xml -BUILD_DIRS+= src/tools/qdbusxml2cpp - -.include "../../x11/qt5-qtbase/Makefile.common" - -CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/include/dbus-1.0 -CFLAGS+= -I${BUILDLINK_PREFIX.dbus}/lib/dbus-1.0/include/dbus -CFLAGS+= -I${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include - -INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} -INSTALLATION_DIRS= lib/pkgconfig - -do-configure: - ${RM} -f -r ${WRKSRC}/mkspecs -.for d in ${BUILD_DIRS} - cd ${WRKSRC}/${d} && ${QTPREFIX}/bin/qmake -o Makefile -.endfor - -post-install: -.for i in Qt5DBus.pc - cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ - ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} -.endfor - -.include "../../devel/gettext-lib/buildlink3.mk" -# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus -USE_DBUS-ARCH-DEPS_H= yes -.include "../../sysutils/dbus/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/qt5-dbus/PLIST b/x11/qt5-dbus/PLIST deleted file mode 100644 index 3a6c6405e46..00000000000 --- a/x11/qt5-dbus/PLIST +++ /dev/null @@ -1,78 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:45 adam Exp $ -lib/pkgconfig/Qt5DBus.pc -qt5/bin/qdbuscpp2xml -qt5/bin/qdbusxml2cpp -qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/dbus_minimal_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 -qt5/include/QtDBus/QDBusArgument -qt5/include/QtDBus/QDBusConnection -qt5/include/QtDBus/QDBusConnectionInterface -qt5/include/QtDBus/QDBusContext -qt5/include/QtDBus/QDBusError -qt5/include/QtDBus/QDBusInterface -qt5/include/QtDBus/QDBusMessage -qt5/include/QtDBus/QDBusMetaType -qt5/include/QtDBus/QDBusObjectPath -qt5/include/QtDBus/QDBusPendingCall -qt5/include/QtDBus/QDBusPendingCallWatcher -qt5/include/QtDBus/QDBusPendingReply -qt5/include/QtDBus/QDBusPendingReplyData -qt5/include/QtDBus/QDBusReply -qt5/include/QtDBus/QDBusServer -qt5/include/QtDBus/QDBusServiceWatcher -qt5/include/QtDBus/QDBusSignature -qt5/include/QtDBus/QDBusUnixFileDescriptor -qt5/include/QtDBus/QDBusVariant -qt5/include/QtDBus/QDBusVirtualObject -qt5/include/QtDBus/QtDBus -qt5/include/QtDBus/QtDBusDepends -qt5/include/QtDBus/QtDBusVersion -qt5/include/QtDBus/qdbusabstractadaptor.h -qt5/include/QtDBus/qdbusabstractinterface.h -qt5/include/QtDBus/qdbusargument.h -qt5/include/QtDBus/qdbusconnection.h -qt5/include/QtDBus/qdbusconnectioninterface.h -qt5/include/QtDBus/qdbuscontext.h -qt5/include/QtDBus/qdbuserror.h -qt5/include/QtDBus/qdbusextratypes.h -qt5/include/QtDBus/qdbusinterface.h -qt5/include/QtDBus/qdbusmacros.h -qt5/include/QtDBus/qdbusmessage.h -qt5/include/QtDBus/qdbusmetatype.h -qt5/include/QtDBus/qdbuspendingcall.h -qt5/include/QtDBus/qdbuspendingreply.h -qt5/include/QtDBus/qdbusreply.h -qt5/include/QtDBus/qdbusserver.h -qt5/include/QtDBus/qdbusservicewatcher.h -qt5/include/QtDBus/qdbusunixfiledescriptor.h -qt5/include/QtDBus/qdbusvirtualobject.h -qt5/include/QtDBus/qtdbusversion.h -qt5/lib/cmake/Qt5DBus/Qt5DBusConfig.cmake -qt5/lib/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake -qt5/lib/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake -qt5/lib/cmake/Qt5DBus/Qt5DBusMacros.cmake -qt5/lib/libQt5DBus.la -qt5/lib/libQt5DBus.prl -qt5/lib/pkgconfig/Qt5DBus.pc -qt5/mkspecs/modules/qt_lib_dbus.pri -qt5/mkspecs/modules/qt_lib_dbus_private.pri -@pkgdir qt5/bin diff --git a/x11/qt5-dbus/buildlink3.mk b/x11/qt5-dbus/buildlink3.mk deleted file mode 100644 index 09045fa66cb..00000000000 --- a/x11/qt5-dbus/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:17 tnn Exp $ - -BUILDLINK_TREE+= qt5-dbus - -.if !defined(QT5_DBUS_BUILDLINK3_MK) -QT5_DBUS_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.qt5-dbus+= qt5-dbus>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-dbus+= qt5-dbus>=5.4.0nb2 -BUILDLINK_PKGSRCDIR.qt5-dbus?= ../../x11/qt5-dbus - -.include "../../sysutils/dbus/buildlink3.mk" -.include "../../x11/qt5-qtbase/buildlink3.mk" -.endif # QT5_DBUS_BUILDLINK3_MK - -BUILDLINK_TREE+= -qt5-dbus diff --git a/x11/qt5-dbus/distinfo b/x11/qt5-dbus/distinfo deleted file mode 100644 index 95a9c5ee653..00000000000 --- a/x11/qt5-dbus/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:24:50 adam Exp $ - -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes diff --git a/x11/qt5-mysql/Makefile b/x11/qt5-mysql/Makefile index f10e19b091c..502e5c73c0d 100644 --- a/x11/qt5-mysql/Makefile +++ b/x11/qt5-mysql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-mysql-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 MySQL plugin CFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql diff --git a/x11/qt5-mysql/buildlink3.mk b/x11/qt5-mysql/buildlink3.mk index b61c14740bc..d69cd4d28f0 100644 --- a/x11/qt5-mysql/buildlink3.mk +++ b/x11/qt5-mysql/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:03:59 adam Exp $ BUILDLINK_TREE+= qt5-mysql .if !defined(QT5_MYSQL_BUILDLINK3_MK) QT5_MYSQL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-mysql+= qt5-mysql>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-mysql+= qt5-mysql>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql BUILDLINK_LIBDIRS.qt5-mysql+= qt5/plugins diff --git a/x11/qt5-mysql/distinfo b/x11/qt5-mysql/distinfo index 95a9c5ee653..03c742d4010 100644 --- a/x11/qt5-mysql/distinfo +++ b/x11/qt5-mysql/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:24:50 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f +RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 +SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 +Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes diff --git a/x11/qt5-odbc/Makefile b/x11/qt5-odbc/Makefile index ef81d074e24..c9c6108d39b 100644 --- a/x11/qt5-odbc/Makefile +++ b/x11/qt5-odbc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-odbc-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 odbc plugin BUILD_DIRS= src/plugins/sqldrivers diff --git a/x11/qt5-odbc/buildlink3.mk b/x11/qt5-odbc/buildlink3.mk index 563ecced3e2..ba811f7669c 100644 --- a/x11/qt5-odbc/buildlink3.mk +++ b/x11/qt5-odbc/buildlink3.mk @@ -1,17 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:03:59 adam Exp $ -BUILDLINK_TREE+= qt5-sqlite3 +BUILDLINK_TREE+= qt5-odbc -.if !defined(QT5_SQLITE3_BUILDLINK3_MK) -QT5_SQLITE3_BUILDLINK3_MK:= +.if !defined(QT5_ODBC_BUILDLINK3_MK) +QT5_ODBC_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3+= qt5-odbc>=5.4.0nb2 -BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 +BUILDLINK_API_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1 +BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc -BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins +BUILDLINK_LIBDIRS.qt5-odbc+= qt5/plugins .include "../../x11/qt5-qtbase/buildlink3.mk" -.endif # QT5_SQLITE3_BUILDLINK3_MK +.endif # QT5_ODBC_BUILDLINK3_MK -BUILDLINK_TREE+= -qt5-sqlite3 +BUILDLINK_TREE+= -qt5-odbc diff --git a/x11/qt5-odbc/distinfo b/x11/qt5-odbc/distinfo index 95a9c5ee653..03c742d4010 100644 --- a/x11/qt5-odbc/distinfo +++ b/x11/qt5-odbc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:24:50 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f +RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 +SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 +Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes diff --git a/x11/qt5-psql/Makefile b/x11/qt5-psql/Makefile index 970d764c043..1fbccdb6b9e 100644 --- a/x11/qt5-psql/Makefile +++ b/x11/qt5-psql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-psql-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 PostgreSQL plugin BUILD_QT5= yes diff --git a/x11/qt5-psql/buildlink3.mk b/x11/qt5-psql/buildlink3.mk index f9d6d905beb..819151e48eb 100644 --- a/x11/qt5-psql/buildlink3.mk +++ b/x11/qt5-psql/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:03:59 adam Exp $ BUILDLINK_TREE+= qt5-psql .if !defined(QT5_PSQL_BUILDLINK3_MK) QT5_PSQL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-psql+= qt5-psql>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-psql+= qt5-psql>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-psql+= qt5-psql>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-psql+= qt5-psql>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql BUILDLINK_LIBDIRS.qt5-psql+= qt5/plugins diff --git a/x11/qt5-psql/distinfo b/x11/qt5-psql/distinfo index 95a9c5ee653..03c742d4010 100644 --- a/x11/qt5-psql/distinfo +++ b/x11/qt5-psql/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:24:50 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f +RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 +SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 +Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 3d938e153fa..841ecb27b49 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} -PKGREVISION= 6 COMMENT= C++ X GUI toolkit .include "../../x11/qt5-qtbase/Makefile.common" @@ -19,12 +18,13 @@ CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} CONFIGURE_ARGS+= -opensource -confirm-license CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" CONFIGURE_ARGS+= -accessibility +CONFIGURE_ARGS+= -dbus-linked CONFIGURE_ARGS+= -fontconfig +CONFIGURE_ARGS+= -force-pkg-config CONFIGURE_ARGS+= -icu CONFIGURE_ARGS+= -openssl-linked CONFIGURE_ARGS+= -nomake examples CONFIGURE_ARGS+= -nomake tests -CONFIGURE_ARGS+= -no-dbus CONFIGURE_ARGS+= -no-pch CONFIGURE_ARGS+= -no-sql-mysql CONFIGURE_ARGS+= -no-sql-psql @@ -91,6 +91,9 @@ LDFLAGS+= -ldl LDFLAGS+= -lexecinfo . endif .endif +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" +LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp +.endif REPLACE_PERL+= bin/syncqt.pl @@ -180,12 +183,15 @@ post-install: .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus +USE_DBUS-ARCH-DEPS_H= yes +.include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" -.if !empty(MESALIB_SUPPORTS_EGL:Myes) +. if !empty(MESALIB_SUPPORTS_EGL:Myes) PLIST.egl= yes -.endif +. endif .include "../../x11/libxcb/buildlink3.mk" .include "../../x11/xcb-util/buildlink3.mk" .include "../../x11/xcb-util-image/buildlink3.mk" diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common index 2870b0aba25..675d7d136f3 100644 --- a/x11/qt5-qtbase/Makefile.common +++ b/x11/qt5-qtbase/Makefile.common @@ -1,5 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2015/02/08 09:07:27 wiz Exp $ -# used by x11/qt5-dbus/Makefile +# $NetBSD: Makefile.common,v 1.16 2015/10/26 19:03:59 adam Exp $ # used by x11/qt5-mysql/Makefile # used by x11/qt5-odbc/Makefile # used by x11/qt5-psql/Makefile @@ -55,7 +54,7 @@ PLIST.unix= yes # avoid creating a .qt directory in the users home directory SCRIPTS_ENV+= HOME=${WRKDIR} -.if empty(PKGPATH:Mx11/qt5-qtbase) && empty(PKGPATH:Mx11/qt5-dbus) \ +.if empty(PKGPATH:Mx11/qt5-qtbase) \ && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \ && empty(PKGPATH:Mx11/qt5-psql) && empty(PKGPATH:Mx11/qt5-sqlite3) do-configure: diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 8c1c67edfd3..757b4692ac9 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2015/08/30 01:21:42 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2015/10/26 19:03:59 adam Exp $ lib/pkgconfig/Qt5Bootstrap.pc lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc @@ -13,6 +13,8 @@ lib/pkgconfig/Qt5Test.pc lib/pkgconfig/Qt5Widgets.pc lib/pkgconfig/Qt5Xml.pc qt5/bin/moc +qt5/bin/qdbuscpp2xml +qt5/bin/qdbusxml2cpp qt5/bin/qdoc qt5/bin/qlalr qt5/bin/qmake @@ -23,7 +25,6 @@ qt5/doc/global/compat.qdocconf qt5/doc/global/config.qdocconf qt5/doc/global/externalsites.qdocconf qt5/doc/global/externalsites/external-resources.qdoc -qt5/doc/global/externalsites/qch-urls.qdoc qt5/doc/global/externalsites/qt-webpages.qdoc qt5/doc/global/externalsites/qtcreator.qdoc qt5/doc/global/externalsites/rfc.qdoc @@ -82,6 +83,7 @@ qt5/doc/global/template/images/spinner.gif qt5/doc/global/template/images/sprites-combined.png qt5/doc/global/template/scripts/extras.js qt5/doc/global/template/scripts/main.js +qt5/doc/global/template/style/cookiebar-x.png qt5/doc/global/template/style/doc_search.png qt5/doc/global/template/style/gsc.css qt5/doc/global/template/style/icomoon.eot @@ -91,6 +93,7 @@ qt5/doc/global/template/style/icomoon.woff qt5/doc/global/template/style/list_arrow.png qt5/doc/global/template/style/offline.css qt5/doc/global/template/style/online.css +qt5/doc/global/template/style/theqtcompany.png qt5/include/QtConcurrent/QtConcurrent qt5/include/QtConcurrent/QtConcurrentDepends qt5/include/QtConcurrent/QtConcurrentFilter @@ -135,6 +138,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatastream_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdataurl_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatetime_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdatetimeparser_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdebug_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qdir_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qelfparser_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qeucjpcodec_p.h @@ -235,6 +239,7 @@ qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsjiscodec_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstate_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstatemachine_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstorageinfo_p.h +qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstringalgorithms_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qstringiterator_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemerror_p.h qt5/include/QtCore/${PKGVERSION}/QtCore/private/qsystemlibrary_p.h @@ -767,6 +772,70 @@ qt5/include/QtCore/qvector.h qt5/include/QtCore/qwaitcondition.h qt5/include/QtCore/qwineventnotifier.h qt5/include/QtCore/qxmlstream.h +qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/dbus_minimal_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 +qt5/include/QtDBus/QDBusArgument +qt5/include/QtDBus/QDBusConnection +qt5/include/QtDBus/QDBusConnectionInterface +qt5/include/QtDBus/QDBusContext +qt5/include/QtDBus/QDBusError +qt5/include/QtDBus/QDBusInterface +qt5/include/QtDBus/QDBusMessage +qt5/include/QtDBus/QDBusMetaType +qt5/include/QtDBus/QDBusObjectPath +qt5/include/QtDBus/QDBusPendingCall +qt5/include/QtDBus/QDBusPendingCallWatcher +qt5/include/QtDBus/QDBusPendingReply +qt5/include/QtDBus/QDBusPendingReplyData +qt5/include/QtDBus/QDBusReply +qt5/include/QtDBus/QDBusServer +qt5/include/QtDBus/QDBusServiceWatcher +qt5/include/QtDBus/QDBusSignature +qt5/include/QtDBus/QDBusUnixFileDescriptor +qt5/include/QtDBus/QDBusVariant +qt5/include/QtDBus/QDBusVirtualObject +qt5/include/QtDBus/QtDBus +qt5/include/QtDBus/QtDBusDepends +qt5/include/QtDBus/QtDBusVersion +qt5/include/QtDBus/qdbusabstractadaptor.h +qt5/include/QtDBus/qdbusabstractinterface.h +qt5/include/QtDBus/qdbusargument.h +qt5/include/QtDBus/qdbusconnection.h +qt5/include/QtDBus/qdbusconnectioninterface.h +qt5/include/QtDBus/qdbuscontext.h +qt5/include/QtDBus/qdbuserror.h +qt5/include/QtDBus/qdbusextratypes.h +qt5/include/QtDBus/qdbusinterface.h +qt5/include/QtDBus/qdbusmacros.h +qt5/include/QtDBus/qdbusmessage.h +qt5/include/QtDBus/qdbusmetatype.h +qt5/include/QtDBus/qdbuspendingcall.h +qt5/include/QtDBus/qdbuspendingreply.h +qt5/include/QtDBus/qdbusreply.h +qt5/include/QtDBus/qdbusserver.h +qt5/include/QtDBus/qdbusservicewatcher.h +qt5/include/QtDBus/qdbusunixfiledescriptor.h +qt5/include/QtDBus/qdbusvirtualobject.h +qt5/include/QtDBus/qtdbusversion.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstractlayoutstyleinfo_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstracttextdocumentlayout_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qaccessiblecache_p.h @@ -785,7 +854,6 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdnd_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawhelper_mips_dsp_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawhelper_neon_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawhelper_p.h -qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawhelper_sse_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawhelper_x86_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qdrawingprimitive_sse2_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qemulationpaintengine_p.h @@ -841,7 +909,6 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglversionfunctionsfactory_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qopenglvertexarrayobject_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qoutlinemapper_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpagedpaintdevice_p.h -qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintbuffer_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintdevicewindow_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintengine_blitter_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/private/qpaintengine_p.h @@ -903,6 +970,8 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformcursor.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformdialoghelper.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformdrag.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformfontdatabase.h +qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformgraphicsbuffer.h +qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformgraphicsbufferhelper.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatforminputcontext.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatforminputcontext_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatforminputcontextfactory_p.h @@ -930,6 +999,8 @@ qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformwindow.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qplatformwindow_p.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qwindowsysteminterface.h qt5/include/QtGui/${PKGVERSION}/QtGui/qpa/qwindowsysteminterface_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p.h +qt5/include/QtGui/${PKGVERSION}/QtGui/private/qinputdevicemanager_p_p.h qt5/include/QtGui/QAbstractTextDocumentLayout qt5/include/QtGui/QAbstractUndoItem qt5/include/QtGui/QAccessible @@ -1060,6 +1131,10 @@ qt5/include/QtGui/QOpenGLFunctions_4_2_Compatibility qt5/include/QtGui/QOpenGLFunctions_4_2_Core qt5/include/QtGui/QOpenGLFunctions_4_3_Compatibility qt5/include/QtGui/QOpenGLFunctions_4_3_Core +qt5/include/QtGui/QOpenGLFunctions_4_4_Compatibility +qt5/include/QtGui/QOpenGLFunctions_4_4_Core +qt5/include/QtGui/QOpenGLFunctions_4_5_Compatibility +qt5/include/QtGui/QOpenGLFunctions_4_5_Core qt5/include/QtGui/QOpenGLFunctions_ES2 qt5/include/QtGui/QOpenGLPaintDevice qt5/include/QtGui/QOpenGLPixelTransferOptions @@ -1092,6 +1167,7 @@ qt5/include/QtGui/QPictureIO qt5/include/QtGui/QPixelFormat qt5/include/QtGui/QPixmap qt5/include/QtGui/QPixmapCache +qt5/include/QtGui/QPlatformSurfaceEvent qt5/include/QtGui/QPolygon qt5/include/QtGui/QPolygonF qt5/include/QtGui/QQuaternion @@ -1234,6 +1310,10 @@ qt5/include/QtGui/qopenglfunctions_4_2_compatibility.h qt5/include/QtGui/qopenglfunctions_4_2_core.h qt5/include/QtGui/qopenglfunctions_4_3_compatibility.h qt5/include/QtGui/qopenglfunctions_4_3_core.h +qt5/include/QtGui/qopenglfunctions_4_4_compatibility.h +qt5/include/QtGui/qopenglfunctions_4_4_core.h +qt5/include/QtGui/qopenglfunctions_4_5_compatibility.h +qt5/include/QtGui/qopenglfunctions_4_5_core.h qt5/include/QtGui/qopenglfunctions_es2.h qt5/include/QtGui/qopenglpaintdevice.h qt5/include/QtGui/qopenglpixeltransferoptions.h @@ -1346,6 +1426,7 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qnetworksession_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsharednetworksession_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsocks5socketengine_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qspdyprotocolhandler_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qssl_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcertificate_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcertificateextension_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslcipher_p.h @@ -1358,6 +1439,9 @@ qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_winrt_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpsocket_p.h qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qurlinfo_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslpresharedkeyauthenticator_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qsslsocket_mac_p.h +qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/qtcpserver_p.h qt5/include/QtNetwork/QAbstractNetworkCache qt5/include/QtNetwork/QAbstractSocket qt5/include/QtNetwork/QAuthenticator @@ -1394,8 +1478,10 @@ qt5/include/QtNetwork/QSslCertificate qt5/include/QtNetwork/QSslCertificateExtension qt5/include/QtNetwork/QSslCipher qt5/include/QtNetwork/QSslConfiguration +qt5/include/QtNetwork/QSslEllipticCurve qt5/include/QtNetwork/QSslError qt5/include/QtNetwork/QSslKey +qt5/include/QtNetwork/QSslPreSharedKeyAuthenticator qt5/include/QtNetwork/QSslSocket qt5/include/QtNetwork/QTcpServer qt5/include/QtNetwork/QTcpSocket @@ -1430,8 +1516,10 @@ qt5/include/QtNetwork/qsslcertificate.h qt5/include/QtNetwork/qsslcertificateextension.h qt5/include/QtNetwork/qsslcipher.h qt5/include/QtNetwork/qsslconfiguration.h +qt5/include/QtNetwork/qsslellipticcurve.h qt5/include/QtNetwork/qsslerror.h qt5/include/QtNetwork/qsslkey.h +qt5/include/QtNetwork/qsslpresharedkeyauthenticator.h qt5/include/QtNetwork/qsslsocket.h qt5/include/QtNetwork/qtcpserver.h qt5/include/QtNetwork/qtcpsocket.h @@ -1487,6 +1575,7 @@ qt5/include/QtPlatformHeaders/QEGLNativeContext qt5/include/QtPlatformHeaders/QEglFSFunctions qt5/include/QtPlatformHeaders/QGLXNativeContext qt5/include/QtPlatformHeaders/QWGLNativeContext +qt5/include/QtPlatformHeaders/QWindowsWindowFunctions qt5/include/QtPlatformHeaders/QXcbWindowFunctions qt5/include/QtPlatformHeaders/QtPlatformHeaders qt5/include/QtPlatformHeaders/QtPlatformHeadersDepends @@ -1497,6 +1586,7 @@ qt5/include/QtPlatformHeaders/qeglnativecontext.h qt5/include/QtPlatformHeaders/qglxnativecontext.h qt5/include/QtPlatformHeaders/qtplatformheadersversion.h qt5/include/QtPlatformHeaders/qwglnativecontext.h +qt5/include/QtPlatformHeaders/qwindowswindowfunctions.h qt5/include/QtPlatformHeaders/qxcbwindowfunctions.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/application_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/atspiadaptor_p.h @@ -1509,11 +1599,12 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qaccessibl qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qbasicfontdatabase_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcfsocketnotifier_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qcoretextfontdatabase_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_dummy_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_p.h -qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglcompositor_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_static_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdevicediscovery_udev_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglconvenience_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglpbuffer_p.h -qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformbackingstore_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcontext_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformcursor_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeglplatformintegration_p.h @@ -1525,7 +1616,6 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevkeyb qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevmousehandler_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevmousemanager_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtablet_p.h -qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtouch_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeventdispatcher_cf_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qeventdispatcher_glib_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qfbbackingstore_p.h @@ -1545,10 +1635,30 @@ qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qmacmime_p qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qxlibeglintegration_p.h qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/struct_marshallers_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenuadaptor_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenuconnection_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusmenutypes_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbusplatformmenu_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbustrayicon_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qdbustraytypes_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtouchhandler_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qevdevtouchmanager_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputhandler_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputkeyboard_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputpointer_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qlibinputtouch_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qopenglcompositor_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qopenglcompositorbackingstore_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qtslib_p.h +qt5/include/QtPlatformSupport/${PKGVERSION}/QtPlatformSupport/private/qxdgnotificationproxy_p.h qt5/include/QtPlatformSupport/QtPlatformSupport qt5/include/QtPlatformSupport/QtPlatformSupportDepends qt5/include/QtPlatformSupport/QtPlatformSupportVersion qt5/include/QtPlatformSupport/qtplatformsupportversion.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintdevice.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintersupport.h +qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintplugin.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qabstractprintdialog_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qcups_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qcupsjobwidget_p.h @@ -1562,9 +1672,6 @@ qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_pdf qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprintengine_win_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinter_p.h qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/private/qprinterinfo_p.h -qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintdevice.h -qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintersupport.h -qt5/include/QtPrintSupport/${PKGVERSION}/QtPrintSupport/qpa/qplatformprintplugin.h qt5/include/QtPrintSupport/QAbstractPrintDialog qt5/include/QtPrintSupport/QPageSetupDialog qt5/include/QtPrintSupport/QPrintDialog @@ -1658,6 +1765,7 @@ qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestlog_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestresult_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtesttable_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qtestxunitstreamer_p.h +qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxctestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxmltestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/qxunittestlogger_p.h qt5/include/QtTest/${PKGVERSION}/QtTest/private/valgrind_p.h @@ -1699,6 +1807,7 @@ qt5/include/QtTest/qtestsystem.h qt5/include/QtTest/qtesttouch.h qt5/include/QtTest/qttestversion.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractbutton_p.h +qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractitemdelegate_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractitemview_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractscrollarea_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qabstractslider_p.h @@ -1828,6 +1937,12 @@ qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsvistastyle_p_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsxpstyle_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwindowsxpstyle_p_p.h qt5/include/QtWidgets/${PKGVERSION}/QtWidgets/private/qwizard_win_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/complexwidgets_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/itemviews_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/qaccessiblemenu_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/qaccessiblewidgets_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/rangecontrols_p.h +qt5/include/QtWidgets/5.5.1/QtWidgets/private/simplewidgets_p.h qt5/include/QtWidgets/QAbstractButton qt5/include/QtWidgets/QAbstractGraphicsShapeItem qt5/include/QtWidgets/QAbstractItemDelegate @@ -1835,45 +1950,7 @@ qt5/include/QtWidgets/QAbstractItemView qt5/include/QtWidgets/QAbstractScrollArea qt5/include/QtWidgets/QAbstractSlider qt5/include/QtWidgets/QAbstractSpinBox -qt5/include/QtWidgets/QAccessibleAbstractScrollArea -qt5/include/QtWidgets/QAccessibleAbstractSlider -qt5/include/QtWidgets/QAccessibleAbstractSpinBox -qt5/include/QtWidgets/QAccessibleButton -qt5/include/QtWidgets/QAccessibleCalendarWidget -qt5/include/QtWidgets/QAccessibleComboBox -qt5/include/QtWidgets/QAccessibleDial -qt5/include/QtWidgets/QAccessibleDialogButtonBox -qt5/include/QtWidgets/QAccessibleDisplay -qt5/include/QtWidgets/QAccessibleDockWidget -qt5/include/QtWidgets/QAccessibleDoubleSpinBox -qt5/include/QtWidgets/QAccessibleGroupBox -qt5/include/QtWidgets/QAccessibleLineEdit -qt5/include/QtWidgets/QAccessibleMainWindow -qt5/include/QtWidgets/QAccessibleMdiArea -qt5/include/QtWidgets/QAccessibleMdiSubWindow -qt5/include/QtWidgets/QAccessibleMenu -qt5/include/QtWidgets/QAccessibleMenuBar -qt5/include/QtWidgets/QAccessibleMenuItem -qt5/include/QtWidgets/QAccessiblePlainTextEdit -qt5/include/QtWidgets/QAccessibleProgressBar -qt5/include/QtWidgets/QAccessibleScrollArea -qt5/include/QtWidgets/QAccessibleScrollBar -qt5/include/QtWidgets/QAccessibleSlider -qt5/include/QtWidgets/QAccessibleSpinBox -qt5/include/QtWidgets/QAccessibleStackedWidget -qt5/include/QtWidgets/QAccessibleTabBar -qt5/include/QtWidgets/QAccessibleTable -qt5/include/QtWidgets/QAccessibleTableCell -qt5/include/QtWidgets/QAccessibleTableCornerButton -qt5/include/QtWidgets/QAccessibleTableHeaderCell -qt5/include/QtWidgets/QAccessibleTextBrowser -qt5/include/QtWidgets/QAccessibleTextEdit -qt5/include/QtWidgets/QAccessibleTextWidget -qt5/include/QtWidgets/QAccessibleToolBox -qt5/include/QtWidgets/QAccessibleToolButton -qt5/include/QtWidgets/QAccessibleTree qt5/include/QtWidgets/QAccessibleWidget -qt5/include/QtWidgets/QAccessibleWindowContainer qt5/include/QtWidgets/QAction qt5/include/QtWidgets/QActionGroup qt5/include/QtWidgets/QApplication @@ -2087,17 +2164,13 @@ qt5/include/QtWidgets/QWizardPage qt5/include/QtWidgets/QtWidgets qt5/include/QtWidgets/QtWidgetsDepends qt5/include/QtWidgets/QtWidgetsVersion -qt5/include/QtWidgets/complexwidgets.h -qt5/include/QtWidgets/itemviews.h qt5/include/QtWidgets/qabstractbutton.h qt5/include/QtWidgets/qabstractitemdelegate.h qt5/include/QtWidgets/qabstractitemview.h qt5/include/QtWidgets/qabstractscrollarea.h qt5/include/QtWidgets/qabstractslider.h qt5/include/QtWidgets/qabstractspinbox.h -qt5/include/QtWidgets/qaccessiblemenu.h qt5/include/QtWidgets/qaccessiblewidget.h -qt5/include/QtWidgets/qaccessiblewidgets.h qt5/include/QtWidgets/qaction.h qt5/include/QtWidgets/qactiongroup.h qt5/include/QtWidgets/qapplication.h @@ -2221,8 +2294,6 @@ qt5/include/QtWidgets/qwidget.h qt5/include/QtWidgets/qwidgetaction.h qt5/include/QtWidgets/qwidgetsfunctions_wince.h qt5/include/QtWidgets/qwizard.h -qt5/include/QtWidgets/rangecontrols.h -qt5/include/QtWidgets/simplewidgets.h qt5/include/QtXml/${PKGVERSION}/QtXml/private/qxml_p.h qt5/include/QtXml/QDomAttr qt5/include/QtXml/QDomCDATASection @@ -2272,6 +2343,10 @@ qt5/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake qt5/lib/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake qt5/lib/cmake/Qt5Core/Qt5CoreConfigVersion.cmake qt5/lib/cmake/Qt5Core/Qt5CoreMacros.cmake +qt5/lib/cmake/Qt5DBus/Qt5DBusConfig.cmake +qt5/lib/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake +qt5/lib/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake +qt5/lib/cmake/Qt5DBus/Qt5DBusMacros.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake @@ -2280,11 +2355,14 @@ ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmak ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake +qt5/lib/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake +${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake ${PLIST.mac}qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake @@ -2313,12 +2391,15 @@ qt5/lib/libQt5Concurrent.la qt5/lib/libQt5Concurrent.prl qt5/lib/libQt5Core.la qt5/lib/libQt5Core.prl +qt5/lib/libQt5DBus.la +qt5/lib/libQt5DBus.prl qt5/lib/libQt5Gui.la qt5/lib/libQt5Gui.prl qt5/lib/libQt5Network.la qt5/lib/libQt5Network.prl qt5/lib/libQt5OpenGL.la qt5/lib/libQt5OpenGL.prl +qt5/lib/libQt5OpenGLExtensions.la qt5/lib/libQt5OpenGLExtensions.prl qt5/lib/libQt5PlatformSupport.la qt5/lib/libQt5PlatformSupport.prl @@ -2330,11 +2411,14 @@ qt5/lib/libQt5Test.la qt5/lib/libQt5Test.prl qt5/lib/libQt5Widgets.la qt5/lib/libQt5Widgets.prl +${PLIST.unix}qt5/lib/libQt5XcbQpa.la +${PLIST.unix}qt5/lib/libQt5XcbQpa.prl qt5/lib/libQt5Xml.la qt5/lib/libQt5Xml.prl qt5/lib/pkgconfig/Qt5Bootstrap.pc qt5/lib/pkgconfig/Qt5Concurrent.pc qt5/lib/pkgconfig/Qt5Core.pc +qt5/lib/pkgconfig/Qt5DBus.pc qt5/lib/pkgconfig/Qt5Gui.pc qt5/lib/pkgconfig/Qt5Network.pc qt5/lib/pkgconfig/Qt5OpenGL.pc @@ -2344,6 +2428,7 @@ qt5/lib/pkgconfig/Qt5PrintSupport.pc qt5/lib/pkgconfig/Qt5Sql.pc qt5/lib/pkgconfig/Qt5Test.pc qt5/lib/pkgconfig/Qt5Widgets.pc +${PLIST.unix}qt5/lib/pkgconfig/Qt5XcbQpa.pc qt5/lib/pkgconfig/Qt5Xml.pc qt5/mkspecs/aix-g++-64/qmake.conf qt5/mkspecs/aix-g++-64/qplatformdefs.h @@ -2357,8 +2442,6 @@ qt5/mkspecs/android-g++/qmake.conf qt5/mkspecs/android-g++/qplatformdefs.h qt5/mkspecs/blackberry-armle-v7-qcc/qmake.conf qt5/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h -qt5/mkspecs/blackberry-armv7le-qcc/qmake.conf -qt5/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h qt5/mkspecs/blackberry-x86-qcc/qmake.conf qt5/mkspecs/blackberry-x86-qcc/qplatformdefs.h qt5/mkspecs/common/aix/qplatformdefs.h @@ -2384,34 +2467,35 @@ qt5/mkspecs/common/llvm.conf qt5/mkspecs/common/mac.conf qt5/mkspecs/common/mac/qplatformdefs.h qt5/mkspecs/common/macx.conf +qt5/mkspecs/common/msvc-desktop.conf qt5/mkspecs/common/nacl/g++-nacl32.conf qt5/mkspecs/common/nacl/g++-nacl64.conf qt5/mkspecs/common/nacl/nacl-base.conf qt5/mkspecs/common/nacl/qplatformdefs.h qt5/mkspecs/common/posix/qplatformdefs.h -qt5/mkspecs/common/qcc-base-qnx-armv7le.conf +qt5/mkspecs/common/qcc-base-qnx-armle-v7.conf qt5/mkspecs/common/qcc-base-qnx-x86.conf qt5/mkspecs/common/qcc-base-qnx.conf qt5/mkspecs/common/qcc-base.conf qt5/mkspecs/common/qmake.conf qt5/mkspecs/common/qnx/qplatformdefs.h +qt5/mkspecs/common/sanitize.conf qt5/mkspecs/common/shell-unix.conf qt5/mkspecs/common/shell-win32.conf qt5/mkspecs/common/unix.conf qt5/mkspecs/common/wince/qmake.conf qt5/mkspecs/common/wince/qplatformdefs.h +qt5/mkspecs/common/winrt_winphone/assets/logo_150x150.png +qt5/mkspecs/common/winrt_winphone/assets/logo_30x30.png +qt5/mkspecs/common/winrt_winphone/assets/logo_310x150.png +qt5/mkspecs/common/winrt_winphone/assets/logo_310x310.png qt5/mkspecs/common/winrt_winphone/assets/logo_44x44.png qt5/mkspecs/common/winrt_winphone/assets/logo_480x800.png +qt5/mkspecs/common/winrt_winphone/assets/logo_620x300.png +qt5/mkspecs/common/winrt_winphone/assets/logo_70x70.png qt5/mkspecs/common/winrt_winphone/assets/logo_71x71.png -qt5/mkspecs/common/winrt_winphone/assets/logo_large.png -qt5/mkspecs/common/winrt_winphone/assets/logo_medium.png -qt5/mkspecs/common/winrt_winphone/assets/logo_small.png -qt5/mkspecs/common/winrt_winphone/assets/logo_splash.png qt5/mkspecs/common/winrt_winphone/assets/logo_store.png -qt5/mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png -qt5/mkspecs/common/winrt_winphone/assets/tile_iconic_small.png -qt5/mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in -qt5/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +qt5/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in qt5/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in qt5/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in qt5/mkspecs/common/winrt_winphone/qmake.conf @@ -2420,12 +2504,6 @@ qt5/mkspecs/cygwin-g++/qmake.conf qt5/mkspecs/cygwin-g++/qplatformdefs.h qt5/mkspecs/darwin-g++/qmake.conf qt5/mkspecs/darwin-g++/qplatformdefs.h -qt5/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf -qt5/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h -qt5/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf -qt5/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h -qt5/mkspecs/devices/blackberry-playbook-x86-qcc/qmake.conf -qt5/mkspecs/devices/blackberry-playbook-x86-qcc/qplatformdefs.h qt5/mkspecs/devices/common/linux_arm_device_post.conf qt5/mkspecs/devices/common/linux_device_post.conf qt5/mkspecs/devices/common/linux_device_pre.conf @@ -2434,7 +2512,6 @@ qt5/mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf qt5/mkspecs/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h -qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf qt5/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h qt5/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -2443,15 +2520,17 @@ qt5/mkspecs/devices/linux-beagleboard-g++/qmake.conf qt5/mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h qt5/mkspecs/devices/linux-imx53qsb-g++/qmake.conf qt5/mkspecs/devices/linux-imx53qsb-g++/qplatformdefs.h -qt5/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp qt5/mkspecs/devices/linux-imx6-g++/qmake.conf qt5/mkspecs/devices/linux-imx6-g++/qplatformdefs.h qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf qt5/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h -qt5/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +qt5/mkspecs/devices/linux-odroid-xu3-g++/qmake.conf +qt5/mkspecs/devices/linux-odroid-xu3-g++/qplatformdefs.h qt5/mkspecs/devices/linux-rasp-pi-g++/qmake.conf qt5/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h +qt5/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf +qt5/mkspecs/devices/linux-rasp-pi2-g++/qplatformdefs.h qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf qt5/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h qt5/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -2477,7 +2556,7 @@ qt5/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in qt5/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qt5/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in qt5/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -qt5/mkspecs/features/data/headersclean/tst_headersclean.cpp.in +qt5/mkspecs/features/data/dummy.cpp qt5/mkspecs/features/dbusadaptors.prf qt5/mkspecs/features/dbuscommon.pri qt5/mkspecs/features/dbusinterfaces.prf @@ -2496,6 +2575,7 @@ qt5/mkspecs/features/include_source_dir.prf qt5/mkspecs/features/incredibuild_xge.prf qt5/mkspecs/features/java.prf qt5/mkspecs/features/lex.prf +qt5/mkspecs/features/link_ltcg.prf qt5/mkspecs/features/link_pkgconfig.prf qt5/mkspecs/features/ltcg.prf qt5/mkspecs/features/mac/default_post.prf @@ -2527,7 +2607,6 @@ qt5/mkspecs/features/qt_docs.prf qt5/mkspecs/features/qt_docs_targets.prf qt5/mkspecs/features/qt_example_installs.prf qt5/mkspecs/features/qt_functions.prf -qt5/mkspecs/features/qt_headersclean.prf qt5/mkspecs/features/qt_helper_lib.prf qt5/mkspecs/features/qt_installs.prf qt5/mkspecs/features/qt_module.prf @@ -2540,10 +2619,12 @@ qt5/mkspecs/features/qt_tool.prf qt5/mkspecs/features/resolve_config.prf qt5/mkspecs/features/resolve_target.prf qt5/mkspecs/features/resources.prf +qt5/mkspecs/features/sanitizer.prf qt5/mkspecs/features/silent.prf qt5/mkspecs/features/simd.prf qt5/mkspecs/features/spec_post.prf qt5/mkspecs/features/spec_pre.prf +qt5/mkspecs/features/static_runtime.prf qt5/mkspecs/features/testcase.prf qt5/mkspecs/features/testcase_targets.prf qt5/mkspecs/features/testcocoon.prf @@ -2582,8 +2663,10 @@ qt5/mkspecs/features/win32/stl_off.prf qt5/mkspecs/features/win32/windeployqt.prf qt5/mkspecs/features/win32/windows.prf qt5/mkspecs/features/winrt/console.prf +qt5/mkspecs/features/winrt/default_pre.prf qt5/mkspecs/features/winrt/font_deployment.prf qt5/mkspecs/features/winrt/package_manifest.prf +qt5/mkspecs/features/xctest.prf qt5/mkspecs/features/yacc.prf qt5/mkspecs/freebsd-g++/qmake.conf qt5/mkspecs/freebsd-g++/qplatformdefs.h @@ -2591,6 +2674,8 @@ qt5/mkspecs/freebsd-g++46/qmake.conf qt5/mkspecs/freebsd-g++46/qplatformdefs.h qt5/mkspecs/freebsd-icc/qmake.conf qt5/mkspecs/freebsd-icc/qplatformdefs.h +qt5/mkspecs/haiku-g++/qmake.conf +qt5/mkspecs/haiku-g++/qplatformdefs.h qt5/mkspecs/hpux-acc-64/qmake.conf qt5/mkspecs/hpux-acc-64/qplatformdefs.h qt5/mkspecs/hpux-acc-o64/qmake.conf @@ -2684,6 +2769,7 @@ qt5/mkspecs/macx-ios-clang/features/default_pre.prf qt5/mkspecs/macx-ios-clang/features/qt.prf qt5/mkspecs/macx-ios-clang/features/qt_config.prf qt5/mkspecs/macx-ios-clang/features/qt_parts.prf +qt5/mkspecs/macx-ios-clang/features/sdk.prf qt5/mkspecs/macx-ios-clang/qmake.conf qt5/mkspecs/macx-ios-clang/qplatformdefs.h qt5/mkspecs/macx-ios-clang/rename_main.sh @@ -2691,6 +2777,9 @@ qt5/mkspecs/macx-llvm/Info.plist.app qt5/mkspecs/macx-llvm/Info.plist.lib qt5/mkspecs/macx-llvm/qmake.conf qt5/mkspecs/macx-llvm/qplatformdefs.h +qt5/mkspecs/macx-xcode/QtTest.plist +qt5/mkspecs/macx-xcode/WorkspaceSettings.xcsettings +qt5/mkspecs/macx-xcode/default.xcscheme qt5/mkspecs/macx-xcode/qmake.conf qt5/mkspecs/macx-xcode/qplatformdefs.h qt5/mkspecs/modules/qt_lib_bootstrap_private.pri @@ -2698,6 +2787,8 @@ qt5/mkspecs/modules/qt_lib_concurrent.pri qt5/mkspecs/modules/qt_lib_concurrent_private.pri qt5/mkspecs/modules/qt_lib_core.pri qt5/mkspecs/modules/qt_lib_core_private.pri +qt5/mkspecs/modules/qt_lib_dbus.pri +qt5/mkspecs/modules/qt_lib_dbus_private.pri qt5/mkspecs/modules/qt_lib_gui.pri qt5/mkspecs/modules/qt_lib_gui_private.pri qt5/mkspecs/modules/qt_lib_network.pri @@ -2715,6 +2806,7 @@ qt5/mkspecs/modules/qt_lib_testlib.pri qt5/mkspecs/modules/qt_lib_testlib_private.pri qt5/mkspecs/modules/qt_lib_widgets.pri qt5/mkspecs/modules/qt_lib_widgets_private.pri +${PLIST.unix}qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri qt5/mkspecs/modules/qt_lib_xml.pri qt5/mkspecs/modules/qt_lib_xml_private.pri qt5/mkspecs/netbsd-g++/qmake.conf @@ -2727,8 +2819,6 @@ qt5/mkspecs/qfeatures.pri qt5/mkspecs/qmodule.pri qt5/mkspecs/qnx-armle-v7-qcc/qmake.conf qt5/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h -qt5/mkspecs/qnx-armv7le-qcc/qmake.conf -qt5/mkspecs/qnx-armv7le-qcc/qplatformdefs.h qt5/mkspecs/qnx-x86-qcc/qmake.conf qt5/mkspecs/qnx-x86-qcc/qplatformdefs.h qt5/mkspecs/sco-cc/qmake.conf @@ -2760,8 +2850,6 @@ qt5/mkspecs/unsupported/android-g++/qmake.conf qt5/mkspecs/unsupported/android-g++/qplatformdefs.h qt5/mkspecs/unsupported/freebsd-clang/qmake.conf qt5/mkspecs/unsupported/freebsd-clang/qplatformdefs.h -qt5/mkspecs/unsupported/integrity-ghs/qmake.conf -qt5/mkspecs/unsupported/integrity-ghs/qplatformdefs.h qt5/mkspecs/unsupported/linux-armcc/qmake.conf qt5/mkspecs/unsupported/linux-armcc/qplatformdefs.h qt5/mkspecs/unsupported/linux-host-g++/qmake.conf @@ -2783,8 +2871,6 @@ qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf qt5/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h qt5/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf qt5/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h -qt5/mkspecs/unsupported/win32-msvc2003/qmake.conf -qt5/mkspecs/unsupported/win32-msvc2003/qplatformdefs.h qt5/mkspecs/win32-g++/qmake.conf qt5/mkspecs/win32-g++/qplatformdefs.h qt5/mkspecs/win32-icc/qmake.conf @@ -2799,6 +2885,8 @@ qt5/mkspecs/win32-msvc2012/qmake.conf qt5/mkspecs/win32-msvc2012/qplatformdefs.h qt5/mkspecs/win32-msvc2013/qmake.conf qt5/mkspecs/win32-msvc2013/qplatformdefs.h +qt5/mkspecs/win32-msvc2015/qmake.conf +qt5/mkspecs/win32-msvc2015/qplatformdefs.h qt5/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf qt5/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h qt5/mkspecs/wince60standard-x86-msvc2005/qmake.conf @@ -2807,32 +2895,32 @@ qt5/mkspecs/wince70embedded-armv4i-msvc2008/qmake.conf qt5/mkspecs/wince70embedded-armv4i-msvc2008/qplatformdefs.h qt5/mkspecs/wince70embedded-x86-msvc2008/qmake.conf qt5/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h -qt5/mkspecs/winphone-arm-msvc2012/qmake.conf -qt5/mkspecs/winphone-arm-msvc2012/qplatformdefs.h +qt5/mkspecs/wince80colibri-armv7-msvc2012/qmake.conf +qt5/mkspecs/wince80colibri-armv7-msvc2012/qplatformdefs.h qt5/mkspecs/winphone-arm-msvc2013/qmake.conf qt5/mkspecs/winphone-arm-msvc2013/qplatformdefs.h -qt5/mkspecs/winphone-x86-msvc2012/qmake.conf -qt5/mkspecs/winphone-x86-msvc2012/qplatformdefs.h qt5/mkspecs/winphone-x86-msvc2013/qmake.conf qt5/mkspecs/winphone-x86-msvc2013/qplatformdefs.h -qt5/mkspecs/winrt-arm-msvc2012/qmake.conf -qt5/mkspecs/winrt-arm-msvc2012/qplatformdefs.h qt5/mkspecs/winrt-arm-msvc2013/qmake.conf qt5/mkspecs/winrt-arm-msvc2013/qplatformdefs.h -qt5/mkspecs/winrt-x64-msvc2012/qmake.conf -qt5/mkspecs/winrt-x64-msvc2012/qplatformdefs.h +qt5/mkspecs/winrt-arm-msvc2015/qmake.conf +qt5/mkspecs/winrt-arm-msvc2015/qplatformdefs.h qt5/mkspecs/winrt-x64-msvc2013/qmake.conf qt5/mkspecs/winrt-x64-msvc2013/qplatformdefs.h -qt5/mkspecs/winrt-x86-msvc2012/qmake.conf -qt5/mkspecs/winrt-x86-msvc2012/qplatformdefs.h +qt5/mkspecs/winrt-x64-msvc2015/qmake.conf +qt5/mkspecs/winrt-x64-msvc2015/qplatformdefs.h qt5/mkspecs/winrt-x86-msvc2013/qmake.conf qt5/mkspecs/winrt-x86-msvc2013/qplatformdefs.h ${PLIST.mac}qt5/plugins/bearer/libqcorewlanbearer.la +qt5/mkspecs/winrt-x86-msvc2015/qmake.conf +qt5/mkspecs/winrt-x86-msvc2015/qplatformdefs.h qt5/plugins/bearer/libqgenericbearer.la +qt5/plugins/generic/libqtuiotouchplugin.la qt5/plugins/imageformats/libqgif.la qt5/plugins/imageformats/libqico.la qt5/plugins/imageformats/libqjpeg.la ${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la +${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.la ${PLIST.mac}qt5/plugins/platforms/libqcocoa.la ${PLIST.egl}qt5/plugins/platforms/libqeglfs.la qt5/plugins/platforms/libqminimal.la @@ -2841,3 +2929,4 @@ qt5/plugins/platforms/libqoffscreen.la ${PLIST.unix}qt5/plugins/platforms/libqxcb.la ${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.la +${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.la diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk index 2d78b0b22e4..3e55c01fd70 100644 --- a/x11/qt5-qtbase/buildlink3.mk +++ b/x11/qt5-qtbase/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2015/10/26 19:03:59 adam Exp $ BUILDLINK_TREE+= qt5-qtbase .if !defined(QT5_QTBASE_BUILDLINK3_MK) QT5_QTBASE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.4.0nb3 +BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include @@ -28,6 +28,7 @@ PTHREAD_OPTS+= require .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index b694ac6700b..28a604a50ce 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,34 +1,34 @@ -$NetBSD: distinfo,v 1.24 2015/09/08 18:55:51 joerg Exp $ +$NetBSD: distinfo,v 1.25 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f +RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 +SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 +Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 -SHA1 (patch-configure) = f8b7c04737473af372165d1b8b48891b8e2b446c +SHA1 (patch-configure) = 7ad9c130af98ffcb703e7be924c46f4cc4be4613 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 -SHA1 (patch-mkspecs_features_simd.prf) = 3dea0d38e2791bdcae589bef38f2cce29a4c5b6c -SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec -SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a -SHA1 (patch-qmake_generators_unix_unixmake.cpp) = b278ab55b2a8083d5bd343d9e748790cf99dc4e6 -SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a -SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = abdb069ef9b77ced3c18a9cc9c18bcdfeda02ce8 -SHA1 (patch-src_corelib_Qt5CoreConfigExtras.cmake.in) = fb0b7d4ec108e668ec4fc583489728d6af91e170 +SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b +SHA1 (patch-qmake_Makefile.unix) = 0b33fc32f493e23da25bfb38ad59a6ae550581e5 +SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3 +SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d +SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995 +SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7 +SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101 SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 -SHA1 (patch-src_corelib_io_io.pri) = ce7630cc611410dec49a43519e9a162caba2ad05 -SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 963030058b0b67df599c8eaf05a2cc8d6bc57706 -SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = d6a8e931c25ce2f7065047a8861728b836bdddf8 -SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98 +SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328 +SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = 62274f5a0c114ef86460218b4de303901ab7d0e6 +SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 41852cf146138df3fd0f26d124a6f9a338d472a0 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d +SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580 +SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611 SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d -SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp) = cee1a36f16cabaaba45815c54ee262db90df0c98 -SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba -SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b -SHA1 (patch-src_tools_qlalr_lalr.cpp) = 33b1e65dc702fd96b60c0190d5ab86a11efbb735 +SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02 +SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 diff --git a/x11/qt5-qtbase/options.mk b/x11/qt5-qtbase/options.mk index 00a496e5045..9dff0a03ec1 100644 --- a/x11/qt5-qtbase/options.mk +++ b/x11/qt5-qtbase/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2015/08/30 01:21:42 markd Exp $ +# $NetBSD: options.mk,v 1.6 2015/10/26 19:03:59 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qt5 PKG_SUPPORTED_OPTIONS= cups debug gtk2 @@ -23,6 +23,7 @@ CONFIGURE_ARGS+= -no-gtkstyle .endif .if !empty(PKG_OPTIONS:Mdebug) +# this does not work - builds libQtBoostracp_debug CC+= -ggdb CXX+= -ggdb CONFIGURE_ARGS+= -debug diff --git a/x11/qt5-qtbase/patches/patch-configure b/x11/qt5-qtbase/patches/patch-configure index ad5ca165682..abb25bcbbf1 100644 --- a/x11/qt5-qtbase/patches/patch-configure +++ b/x11/qt5-qtbase/patches/patch-configure @@ -1,11 +1,11 @@ -$NetBSD: patch-configure,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-configure,v 1.2 2015/10/26 19:03:59 adam Exp $ * Don't use SDKs on OS X * Add NetBSD/sparc{,64} support ---- configure.orig 2014-02-01 20:37:23.000000000 +0000 +--- configure.orig 2015-06-29 20:03:05.000000000 +0000 +++ configure -@@ -319,7 +319,6 @@ getQMakeConf() +@@ -337,7 +337,6 @@ getQMakeConf() { if [ -z "$specvals" ]; then specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"` @@ -13,7 +13,7 @@ $NetBSD: patch-configure,v 1.1 2014/12/30 17:23:46 adam Exp $ fi getSingleQMakeVariable "$1" "$specvals" } -@@ -328,7 +327,6 @@ getXQMakeConf() +@@ -346,7 +345,6 @@ getXQMakeConf() { if [ -z "$xspecvals" ]; then xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"` @@ -21,7 +21,7 @@ $NetBSD: patch-configure,v 1.1 2014/12/30 17:23:46 adam Exp $ fi getSingleQMakeVariable "$1" "$xspecvals" } -@@ -2679,6 +2677,19 @@ if [ -z "$PLATFORM" ]; then +@@ -2894,6 +2892,19 @@ if [ -z "$PLATFORM" ]; then UNIX_SV:*) PLATFORM=unixware-g++ ;; @@ -41,12 +41,16 @@ $NetBSD: patch-configure,v 1.1 2014/12/30 17:23:46 adam Exp $ QNX:*) PLATFORM=unsupported/qnx-g++ ;; -@@ -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" --[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" -+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" - - # X11/Unix/Mac only configs - [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS" +@@ -4001,10 +4012,12 @@ if true; then ###[ '!' -f "$outpath/bin/ + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" + EXTRA_OBJS="$EXTRA_OBJS \ + qsettings_mac.o \ ++ qstring_mac.o \ + qcore_mac.o \ + qcore_mac_objc.o" + EXTRA_SRCS="$EXTRA_SRCS \ + \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \ ++ \"\$(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm\" \ + \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ + \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\"" + fi diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf index 90eaf749f4d..1bcf201745c 100644 --- a/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf +++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf @@ -1,5 +1,7 @@ -$NetBSD: patch-mkspecs_features_simd.prf,v 1.1 2015/01/01 21:05:13 wiz Exp $ +$NetBSD: patch-mkspecs_features_simd.prf,v 1.2 2015/10/26 19:03:59 adam Exp $ + * Use libtool + --- mkspecs/features/simd.prf.orig 2014-12-05 16:24:38.000000000 +0000 +++ mkspecs/features/simd.prf @@ -33,12 +33,12 @@ defineTest(addSimdCompiler) { diff --git a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix index ddc66c7dfd1..ab06baedb16 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix +++ b/x11/qt5-qtbase/patches/patch-qmake_Makefile.unix @@ -1,10 +1,18 @@ -$NetBSD: patch-qmake_Makefile.unix,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-qmake_Makefile.unix,v 1.2 2015/10/26 19:03:59 adam Exp $ * Pass environmental variables from pkgsrc ---- qmake/Makefile.unix.orig 2014-12-05 16:24:30.000000000 +0000 +--- qmake/Makefile.unix.orig 2015-06-29 20:03:23.000000000 +0000 +++ qmake/Makefile.unix -@@ -92,7 +92,7 @@ DEPEND_SRC = \ +@@ -74,6 +74,7 @@ DEPEND_SRC = \ + $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp \ + $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \ + $(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \ ++ $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm \ + $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \ + $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \ + $(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \ +@@ -93,7 +94,7 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/json/qjsonvalue.cpp \ $(QTSRCS) @@ -13,7 +21,7 @@ $NetBSD: patch-qmake_Makefile.unix,v 1.1 2014/12/30 17:23:46 adam Exp $ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ -I$(INC_PATH) -I$(INC_PATH)/QtCore \ -@@ -105,7 +105,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ +@@ -106,7 +107,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS @@ -22,3 +30,13 @@ $NetBSD: patch-qmake_Makefile.unix,v 1.1 2014/12/30 17:23:46 adam Exp $ first all: $(BUILD_PATH)/bin/qmake$(EXEEXT) qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT) +@@ -284,6 +285,9 @@ qstring.o: $(SOURCE_PATH)/src/corelib/to + qstring_compat.o: $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_compat.cpp + ++qstring_mac.o: $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm ++ $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring_mac.mm ++ + qstringbuilder.o: $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringbuilder.cpp + diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp index 2c34faa3964..2555884ed0d 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-qmake_generators_makefile.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ * Libtoolized ---- qmake/generators/makefile.cpp.orig 2014-09-11 10:48:00.000000000 +0000 +--- qmake/generators/makefile.cpp.orig 2015-06-29 20:03:22.000000000 +0000 +++ qmake/generators/makefile.cpp -@@ -3299,7 +3299,7 @@ MakefileGenerator::writePkgConfigFile() +@@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile() pkgConfiglibName = "-framework " + bundle + " "; } else { if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir)) - t << "-L${libdir} "; + t << "-Wl,-R${libdir} -L${libdir} "; - pkgConfiglibName = "-l" + unescapeFilePath(project->first("QMAKE_ORIG_TARGET")); + pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET"); if (project->isActiveConfig("shared")) pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString(); diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp index e1738327741..91dcdba750e 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.2 2015/01/06 23:00:16 joerg Exp $ +$NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.3 2015/10/26 19:03:59 adam Exp $ * fix install target so that destdir is added when installing QMAKE_TARGET ---- qmake/generators/unix/unixmake.cpp.orig 2014-12-05 16:24:30.000000000 +0000 +--- qmake/generators/unix/unixmake.cpp.orig 2015-06-29 20:03:23.000000000 +0000 +++ qmake/generators/unix/unixmake.cpp -@@ -353,27 +353,29 @@ UnixMakefileGenerator::init() +@@ -326,27 +326,29 @@ UnixMakefileGenerator::init() if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { @@ -31,10 +31,10 @@ $NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.2 2015/01/06 23:00:16 joer - if(QDir::isRelativePath(rpath)) - rpath.prepend(Option::output_dir + Option::dir_sep); - } -+ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); -+ if(rpath.right(1) != Option::dir_sep) -+ rpath += Option::dir_sep; - comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); ++ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); ++ if(rpath.right(1) != Option::dir_sep) ++ rpath += Option::dir_sep; + comp_flags += " -rpath " + escapeFilePath(Option::fixPathToTargetOS(rpath, false)); } } } @@ -44,33 +44,35 @@ $NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.2 2015/01/06 23:00:16 joer } else { libtool_flags += " --mode=compile"; } -@@ -729,7 +731,6 @@ UnixMakefileGenerator::defaultInstall(co - QString targetdir = Option::fixPathToTargetOS(project->first("target.path").toQString(), false); +@@ -705,7 +707,7 @@ UnixMakefileGenerator::defaultInstall(co + QString ret, destdir = project->first("DESTDIR").toQString(); if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) destdir += Option::dir_sep; -- targetdir = fileFixify(targetdir, FileFixifyAbsolute); +- QString targetdir = fileFixify(project->first("target.path").toQString(), FileFixifyAbsolute); ++ QString targetdir = project->first("target.path").toQString(); if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -769,10 +770,18 @@ UnixMakefileGenerator::defaultInstall(co - QString src_targ = target; +@@ -745,10 +747,19 @@ UnixMakefileGenerator::defaultInstall(co + QString src_targ = escapeFilePath(target); if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; - QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); + QString dst_dir = targetdir; if(QDir::isRelativePath(dst_dir)) - dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); -- ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; +- ret = "-$(LIBTOOL) --mode=install cp " + src_targ + ' ' + escapeFilePath(filePrefixRoot(root, dst_dir)); ++ dst_dir = Option::fixPathToTargetOS(dst_dir); + dst_dir = Option::fixPathToTargetOS(dst_dir); + if(!ret.isEmpty()) + ret += "\n\t"; + if(project->first("TEMPLATE") == "app") { -+ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; -+ } else { -+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; -+ } ++ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; ++ } else { ++ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; ++ } + if(!uninst.isEmpty()) + uninst.append("\n\t"); - uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\""); + uninst.append("-$(LIBTOOL) --mode=uninstall " + src_targ); } else { QString src_targ = target; diff --git a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp index 3d81370013d..8d365586300 100644 --- a/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp +++ b/x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp @@ -1,47 +1,47 @@ -$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ * Libtoolized ---- qmake/generators/unix/unixmake2.cpp.orig 2014-09-11 10:48:00.000000000 +0000 +--- qmake/generators/unix/unixmake2.cpp.orig 2015-06-29 20:03:23.000000000 +0000 +++ qmake/generators/unix/unixmake2.cpp -@@ -112,12 +112,12 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -178,12 +178,12 @@ UnixMakefileGenerator::writeMakeParts(QT t << "####### Compiler, tools and options\n\n"; t << "CC = " << var("QMAKE_CC") << endl; t << "CXX = " << var("QMAKE_CXX") << endl; - t << "DEFINES = " -+ t << "DEFINES += " ++ t << "DEFINES += " << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ") << varGlue("DEFINES","-D"," -D","") << endl; - t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n"; - t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; -- t << "INCPATH = -I" << specdir(); -+ t << "CFLAGS += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n"; -+ t << "CXXFLAGS += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; -+ t << "INCPATH += -I" << specdir(); - if(!project->isActiveConfig("no_include_pwd")) { - QString pwd = escapeFilePath(fileFixify(qmake_getpwd())); - if(pwd.isEmpty()) -@@ -144,8 +144,8 @@ UnixMakefileGenerator::writeMakeParts(QT +- t << "INCPATH ="; ++ t << "CFLAGS += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n"; ++ t << "CXXFLAGS += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; ++ t << "INCPATH +="; + { + QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); + const ProStringList &incs = project->values("INCLUDEPATH"); +@@ -207,8 +207,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isActiveConfig("staticlib")) { t << "LINK = " << var("QMAKE_LINK") << endl; - t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; -- t << "LIBS = $(SUBLIBS) " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; -+ t << "LFLAGS += " << var("QMAKE_LFLAGS") << endl; -+ t << "LIBS += $(SUBLIBS) " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; +- t << "LIBS = $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' ' ++ t << "LFLAGS += " << var("QMAKE_LFLAGS") << endl; ++ t << "LIBS += $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' ' + << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl; } - t << "AR = " << var("QMAKE_AR") << endl; -@@ -234,6 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -284,6 +284,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isEmpty("QMAKE_BUNDLE")) { - t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; - t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; + t << "TARGETD = " << fileVar("TARGET_x.y") << endl; + t << "TARGET0 = " << fileVar("TARGET_") << endl; + } else if(project->isActiveConfig("compile_libtool")) { + t << "TARGETD = " << var("TARGET_la") << endl; } else if (!project->isActiveConfig("unversioned_libname")) { - t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; + t << "TARGET0 = " << fileVar("TARGET_") << endl; if (project->isEmpty("QMAKE_HPUX_SHLIB")) { -@@ -1073,8 +1075,12 @@ void UnixMakefileGenerator::init2() +@@ -1185,8 +1187,12 @@ void UnixMakefileGenerator::init2() } else if (project->isActiveConfig("staticlib")) { project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB")); project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB"); diff --git a/x11/qt5-qtbase/patches/patch-qmake_qmake.pri b/x11/qt5-qtbase/patches/patch-qmake_qmake.pri new file mode 100644 index 00000000000..8df02cbace1 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-qmake_qmake.pri @@ -0,0 +1,15 @@ +$NetBSD: patch-qmake_qmake.pri,v 1.1 2015/10/26 19:03:59 adam Exp $ + +Fix building on Darwin. + +--- qmake/qmake.pri.orig 2015-07-20 09:25:44.000000000 +0000 ++++ qmake/qmake.pri +@@ -136,7 +136,7 @@ bootstrap { #Qt code + SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp + mac { + SOURCES += qcore_mac.cpp qsettings_mac.cpp +- OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm ++ OBJECTIVE_SOURCES += qcore_mac_objc.mm qlocale_mac.mm qstring_mac.mm + LIBS += -framework ApplicationServices -framework CoreServices -framework Foundation + } else { + SOURCES += qlocale_unix.cpp diff --git a/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp b/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp index 96179d5c078..0c25f5eaf38 100644 --- a/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp +++ b/x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp @@ -1,4 +1,6 @@ -$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-src_concurrent_qtconcurrentiteratekernel.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ + +Fix building on Darwin. --- src/concurrent/qtconcurrentiteratekernel.cpp.orig 2013-11-27 01:01:16.000000000 +0000 +++ src/concurrent/qtconcurrentiteratekernel.cpp diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in b/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in deleted file mode 100644 index 4025ff5a9b0..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_corelib_Qt5CoreConfigExtras.cmake.in +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_corelib_Qt5CoreConfigExtras.cmake.in,v 1.1 2015/05/18 14:02:02 nros Exp $ -Then PIE is set cmake sometimes builds object files that are to be used -in shared objects with PIE when is supposed to use only PIC. -This patch exists in qt5 5.5. -http://code.qt.io/cgit/qt/qtbasegit/log/src/corelib/Qt5CoreConfigExtras.cmake.in ---- src/corelib/Qt5CoreConfigExtras.cmake.in.orig 2015-05-12 21:00:11.000000000 +0000 -+++ src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -72,7 +72,7 @@ set(_qt5_corelib_extra_includes) - # macro to add it. - set(Qt5_POSITION_INDEPENDENT_CODE True) - set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\") --set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\") -+set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIC\") - !!ENDIF - - !!IF !isEmpty(QT_NAMESPACE) diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri index c74cd596d1b..64eb9e50448 100644 --- a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri @@ -1,10 +1,8 @@ -$NetBSD: patch-src_corelib_io_io.pri,v 1.3 2015/08/30 04:13:46 markd Exp $ +$NetBSD: patch-src_corelib_io_io.pri,v 1.4 2015/10/26 19:03:59 adam Exp $ -* Add NetBSD support * Add DragonFly support * Patch sent and merged upstream: http://codereview.qt-project.org/#/c/111741/ - * fix linux test. --- src/corelib/io/io.pri.orig 2014-12-05 16:24:37.000000000 +0000 @@ -20,7 +18,7 @@ $NetBSD: patch-src_corelib_io_io.pri,v 1.3 2015/08/30 04:13:46 markd Exp $ } !nacl { -- freebsd-*|mac|darwin-*|openbsd-*:{ +- freebsd-*|mac|darwin-*|openbsd-*|netbsd-*:{ + freebsd-*|mac|darwin-*|openbsd-*|netbsd-*|dragonfly-*:{ SOURCES += io/qfilesystemwatcher_kqueue.cpp HEADERS += io/qfilesystemwatcher_kqueue_p.h diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp deleted file mode 100644 index 1c93853748d..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.2 2015/05/18 13:52:24 nros Exp $ - -* Add NetBSD support -* patch filed and merged upstream: - http://codereview.qt-project.org/#/c/111741/ - ---- src/corelib/io/qfilesystemwatcher.cpp.orig 2014-09-11 10:48:06.000000000 +0000 -+++ src/corelib/io/qfilesystemwatcher.cpp -@@ -60,7 +60,7 @@ - # include "qfilesystemwatcher_win_p.h" - #elif defined(USE_INOTIFY) - # include "qfilesystemwatcher_inotify_p.h" --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) - # include "qfilesystemwatcher_kqueue_p.h" - #elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 - # include "qfilesystemwatcher_fsevents_p.h" -@@ -76,7 +76,7 @@ QFileSystemWatcherEngine *QFileSystemWat - // there is a chance that inotify may fail on Linux pre-2.6.13 (August - // 2005), so we can't just new inotify directly. - return QInotifyFileSystemWatcherEngine::create(parent); --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) - return QKqueueFileSystemWatcherEngine::create(parent); - #elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 - return QFseventsFileSystemWatcherEngine::create(parent); diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp new file mode 100644 index 00000000000..51b57802b55 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp @@ -0,0 +1,37 @@ +$NetBSD: patch-src_corelib_io_qlockfile__unix.cpp,v 1.1 2015/10/26 19:03:59 adam Exp $ + +Add support for NetBSD and OpenBSD. + +--- src/corelib/io/qlockfile_unix.cpp.orig 2015-10-25 12:40:42.000000000 +0000 ++++ src/corelib/io/qlockfile_unix.cpp +@@ -54,6 +54,10 @@ + #elif defined(Q_OS_LINUX) + # include <unistd.h> + # include <cstdio> ++#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) ++# include <kvm.h> ++# include <sys/param.h> ++# include <sys/sysctl.h> + #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) + # include <sys/user.h> + # if defined(__GLIBC__) && defined(__FreeBSD_kernel__) +@@ -239,6 +243,19 @@ QString QLockFilePrivate::processNameByP + } + buf[len] = 0; + return QFileInfo(QFile::decodeName(buf)).fileName(); ++#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) ++ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++ int cnt; ++ QString name; ++ struct kinfo_proc2 *proc = kvm_getproc2(kd, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), &cnt); ++ if (!proc) { ++ name = QString(); ++ } ++ else { ++ name = QFile::decodeName(proc->p_comm); ++ } ++ kvm_close(kd); ++ return name; + #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) + # if defined(__GLIBC__) && defined(__FreeBSD_kernel__) + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid }; diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp index b347753e3f1..7490a06db69 100644 --- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp +++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp @@ -1,64 +1,36 @@ -$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.4 2015/04/15 14:10:15 nros Exp $ +$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.5 2015/10/26 19:03:59 adam Exp $ + * make statvfs available on non-NetBSD BSD platforms -* NetBSD uses struct statvfs as first argument to getmntinfo * fix build on SunOS -* filed and commited upstream: http://codereview.qt-project.org/110257 - everything here is fixed in QT 5.5 ---- src/corelib/io/qstorageinfo_unix.cpp.orig 2014-12-05 16:24:37.000000000 +0000 + +--- src/corelib/io/qstorageinfo_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000 +++ src/corelib/io/qstorageinfo_unix.cpp -@@ -52,6 +52,7 @@ +@@ -68,8 +68,8 @@ #if defined(Q_OS_BSD4) - # include <sys/mount.h> -+# include <sys/statvfs.h> - #elif defined(Q_OS_ANDROID) - # include <sys/mount.h> - # include <sys/vfs.h> -@@ -63,6 +64,7 @@ - # include <sys/statvfs.h> - #elif defined(Q_OS_SOLARIS) - # include <sys/mnttab.h> -+# include <sys/statvfs.h> - #endif - - #if defined(Q_OS_BSD4) -@@ -118,7 +120,11 @@ public: - inline QByteArray device() const; - private: - #if defined(Q_OS_BSD4) -- statfs *stat_buf; -+#if defined(Q_OS_NETBSD) -+ QT_STATFSBUF *stat_buf; -+#else -+ struct statfs *stat_buf; -+#endif - int entryCount; - int currentIndex; - #elif defined(Q_OS_SOLARIS) -@@ -196,22 +202,22 @@ inline bool QStorageIterator::isValid() - - inline bool QStorageIterator::next() - { -- return ::getmntent(fp, &mnt) == Q_NULLPTR; -+ return ::getmntent(fp, &mnt) == 0; - } - - inline QString QStorageIterator::rootPath() const - { -- return QFile::decodeName(mnt->mnt_mountp); -+ return QFile::decodeName(mnt.mnt_mountp); - } - - inline QByteArray QStorageIterator::fileSystemType() const - { -- return QByteArray(mnt->mnt_fstype); -+ return QByteArray(mnt.mnt_fstype); - } - - inline QByteArray QStorageIterator::device() const - { -- return QByteArray(mnt->mnt_mntopts); -+ return QByteArray(mnt.mnt_mntopts); - } - + # if defined(Q_OS_NETBSD) +- define QT_STATFSBUF struct statvfs +- define QT_STATFS ::statvfs ++# define QT_STATFSBUF struct statvfs ++# define QT_STATFS ::statvfs + # else + # define QT_STATFSBUF struct statfs + # define QT_STATFS ::statfs +@@ -78,7 +78,7 @@ + # if !defined(ST_RDONLY) + # define ST_RDONLY MNT_RDONLY + # endif +-# if !defined(_STATFS_F_FLAGS) ++# if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD) + # define _STATFS_F_FLAGS 1 + # endif #elif defined(Q_OS_ANDROID) +@@ -87,7 +87,7 @@ + # if !defined(ST_RDONLY) + # define ST_RDONLY 1 // hack for missing define on Android + # endif +-#elif defined(Q_OS_HAIKU) ++#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS) + # define QT_STATFSBUF struct statvfs + # define QT_STATFS ::statvfs + #else diff --git a/x11/qt5-qtbase/patches/patch-src_gui_image_qbmphandler.cpp b/x11/qt5-qtbase/patches/patch-src_gui_image_qbmphandler.cpp deleted file mode 100644 index 1c64efc5c36..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_gui_image_qbmphandler.cpp +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-src_gui_image_qbmphandler.cpp,v 1.1 2015/03/28 17:04:50 bsiegert Exp $ -https://codereview.qt-project.org/#/c/106929/4 - -Fix a division by zero when processing malformed BMP files. - -This fixes a division by 0 when processing a maliciously crafted BMP -file. No impact beyond DoS. ---- src/gui/image/qbmphandler.cpp.orig 2015-03-24 21:58:44.000000000 +0000 -+++ src/gui/image/qbmphandler.cpp -@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - alpha_shift = calc_shift(alpha_mask); -+ if (((alpha_mask >> alpha_shift) + 1) == 0) -+ return false; - alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; diff --git a/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro b/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro new file mode 100644 index 00000000000..a8a3e5c2b44 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro @@ -0,0 +1,12 @@ +$NetBSD: patch-src_openglextensions_openglextensions.pro,v 1.1 2015/10/26 19:03:59 adam Exp $ + +Build shared library. + +--- src/openglextensions/openglextensions.pro.orig 2015-10-26 11:22:39.000000000 +0000 ++++ src/openglextensions/openglextensions.pro +@@ -1,5 +1,4 @@ + TARGET = QtOpenGLExtensions +-CONFIG += static + + contains(QT_CONFIG, opengl):CONFIG += opengl + contains(QT_CONFIG, opengles2):CONFIG += opengles2 diff --git a/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri b/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri new file mode 100644 index 00000000000..222962c8d36 --- /dev/null +++ b/x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri @@ -0,0 +1,12 @@ +$NetBSD: patch-src_platformsupport_devicediscovery_devicediscovery.pri,v 1.1 2015/10/26 19:03:59 adam Exp $ + +Add missing header; required when libQt5PlatformSupport is a shared library. + +--- src/platformsupport/devicediscovery/devicediscovery.pri.orig 2015-10-25 19:25:35.000000000 +0000 ++++ src/platformsupport/devicediscovery/devicediscovery.pri +@@ -15,4 +15,5 @@ linux { + } + } else { + SOURCES += $$PWD/qdevicediscovery_dummy.cpp ++ HEADERS += $$PWD/qdevicediscovery_dummy_p.h + } diff --git a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp b/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp deleted file mode 100644 index 7d63226ab9f..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp,v 1.1 2015/04/03 09:28:20 mrg Exp $ - -handle earlier Xinput versions. - ---- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp.orig 2015-04-03 00:37:14.000000000 -0700 -+++ src/plugins/platforms/xcb/qxcbconnection_xi2.cpp 2015-04-03 00:35:27.000000000 -0700 -@@ -175,9 +175,11 @@ - case XIKeyClass: - qCDebug(lcQpaXInputDevices) << " it's a keyboard"; - break; -+#ifdef XITouchClass - case XITouchClass: - // will be handled in deviceForId() - break; -+#endif - default: - qCDebug(lcQpaXInputDevices) << " has class" << devices[i].classes[c]->type; - break; diff --git a/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro b/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro index f8cc0093b50..36c2f5ef144 100644 --- a/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro +++ b/x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro @@ -1,8 +1,8 @@ -$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-src_tools_bootstrap_bootstrap.pro,v 1.2 2015/10/26 19:03:59 adam Exp $ -* Create shared library .so file fo libQt5Bootstrap.la. +* Create shared library .so file libQt5Bootstrap.la. ---- src/tools/bootstrap/bootstrap.pro.orig 2013-11-27 01:01:11.000000000 +0000 +--- src/tools/bootstrap/bootstrap.pro.orig 2015-07-27 10:28:43.000000000 +0000 +++ src/tools/bootstrap/bootstrap.pro @@ -1,4 +1,4 @@ -option(host_build) diff --git a/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp b/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp index 0a2ccf19e8b..5fd51ef2ae5 100644 --- a/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp +++ b/x11/qt5-qtbase/patches/patch-src_tools_moc_main.cpp @@ -1,12 +1,13 @@ -$NetBSD: patch-src_tools_moc_main.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-src_tools_moc_main.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ + +rh#756395, https://bugreports.qt-project.org/browse/QTBUG-22829 --- src/tools/moc/main.cpp.orig 2013-11-27 01:01:11.000000000 +0000 +++ src/tools/moc/main.cpp -@@ -192,6 +192,8 @@ int runMoc(int argc, char **argv) +@@ -192,6 +192,7 @@ 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"]; // Don't stumble over GCC extensions diff --git a/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp b/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp deleted file mode 100644 index 4e3a45d3b4d..00000000000 --- a/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-src_tools_qlalr_lalr.cpp,v 1.1 2015/09/08 18:55:51 joerg Exp $ - ---- src/tools/qlalr/lalr.cpp.orig 2015-08-30 17:58:52.000000000 +0000 -+++ src/tools/qlalr/lalr.cpp -@@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar () - non_terminals.insert (accept_symbol); - } - --struct _Nullable: public std::unary_function<Name, bool> -+struct qt_Nullable: public std::unary_function<Name, bool> - { - Automaton *_M_automaton; - -- _Nullable (Automaton *aut): -+ qt_Nullable (Automaton *aut): - _M_automaton (aut) {} - - bool operator () (Name name) const -@@ -300,7 +300,7 @@ void Automaton::buildNullables () - - for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule) - { -- NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this))); -+ NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (qt_Nullable (this))); - - if (nn == rule->rhs.end ()) - changed |= nullables.insert (rule->lhs).second; -@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph () - if (! _M_grammar->isNonTerminal (*A)) - continue; - -- NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this))); -+ NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (qt_Nullable (this))); - if (first_not_nullable != rule->rhs.end ()) - continue; - diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile index 4a1b40dcba1..4d3bce280f3 100644 --- a/x11/qt5-qtdeclarative/Makefile +++ b/x11/qt5-qtdeclarative/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtdeclarative-opensource-src-${QTVERSION} PKGNAME= qt5-qtdeclarative-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for declarative framework BUILD_TARGET= sub-tools diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST index 31dcfd38b48..a14b1e35f0b 100644 --- a/x11/qt5-qtdeclarative/PLIST +++ b/x11/qt5-qtdeclarative/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2014/12/30 17:23:46 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/10/26 19:03:59 adam Exp $ lib/pkgconfig/Qt5Qml.pc lib/pkgconfig/Qt5QmlDevTools.pc lib/pkgconfig/Qt5Quick.pc lib/pkgconfig/Qt5QuickParticles.pc lib/pkgconfig/Qt5QuickTest.pc qt5/bin/qml -qt5/bin/qmlbundle qt5/bin/qmleasing qt5/bin/qmlimportscanner qt5/bin/qmllint @@ -46,7 +45,6 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbinding_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlboundsignal_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlboundsignalexpressionpointer_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbuiltinfunctions_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbundle_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlchangeset_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcleanup_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcompiler_p.h @@ -103,9 +101,10 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllistwrapper_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllocale_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmemoryprofiler_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmetatype_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmodelindexvaluetype_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmodelsmodule_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnotifier_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnullablevalue_p_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnullablevalue_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectcreator_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectmodel_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlopenmetaobject_p.h @@ -123,7 +122,6 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlscriptstring_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlstringconverters_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlthread_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltimer_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltrace_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypecompiler_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypeloader_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypenamecache_p.h @@ -144,6 +142,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qsequentialanimationgroupjob_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qtqmlglobal_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4alloca_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4argumentsobject_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arraybuffer_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arraydata_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arrayobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4assembler_p.h @@ -153,6 +152,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4codegen_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compileddata_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compiler_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4context_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dataview_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dateobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugging_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugservice_p.h @@ -206,13 +206,13 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4ssa_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4string_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4stringobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4targetplatform_p.h +qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4typedarray_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4unop_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4util_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_inl_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4variantobject_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4vme_moth_p.h -qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8debug_p.h qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8engine_p.h qt5/include/QtQml/QJSEngine qt5/include/QtQml/QJSValue @@ -277,10 +277,105 @@ qt5/include/QtQml/qqmlpropertyvaluesource.h qt5/include/QtQml/qqmlscriptstring.h qt5/include/QtQml/qtqmlglobal.h qt5/include/QtQml/qtqmlversion.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qbitfield_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qdeletewatcher_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfieldlist_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfinitestack_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qflagpointer_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashedstring_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashfield_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qintrusivelist_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qlazilyallocated_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpodvector_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpointervaluepair_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlirbuilder_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsast_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastfwd_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastvisitor_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsengine_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsglobal_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsgrammar_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljskeywords_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljslexer_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsmemorypool_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsparser_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlnullablevalue_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlpool_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlrefcount_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlthread_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmltypecompiler_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecursionwatcher_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecyclepool_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4alloca_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4argumentsobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraybuffer_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraydata_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arrayobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4booleanobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4codegen_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compileddata_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compiler_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4context_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dataview_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dateobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4debugging_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4engine_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4errorobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4executableallocator_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4function_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4functionobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4global_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4globalobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifier_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifiertable_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4include_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4instr_moth_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4internalclass_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_moth_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_util_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsir_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsonobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4lookup_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4managed_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4math_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mathobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4memberdata_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mm_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4numberobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4object_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectiterator_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectproto_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4persistent_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4profiling_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4property_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qmlextensions_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qobjectwrapper_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexp_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexpobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4runtime_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4scopedvalue_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4script_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sequenceobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4serialize_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sparsearray_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4ssa_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4string_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4stringobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4typedarray_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4util_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_inl_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4variantobject_p.h +qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4vme_moth_p.h +qt5/include/QtQmlDevTools/QtQmlDevTools +qt5/include/QtQmlDevTools/QtQmlDevToolsDepends +qt5/include/QtQmlDevTools/QtQmlDevToolsVersion +qt5/include/QtQmlDevTools/qtqmldevtoolsversion.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/designerwindowmanager_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickitem_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickview_p.h -qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qqmlaccessible_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessibleattached_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessiblefactory_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p.h @@ -362,6 +457,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffect_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectmesh_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectnode_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectsource_p.h +qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshortcut_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p_p.h qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspringanimation_p.h @@ -553,8 +649,6 @@ qt5/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake qt5/lib/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake qt5/lib/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake -qt5/lib/cmake/Qt5QmlDevTools/Qt5QmlDevToolsConfig.cmake -qt5/lib/cmake/Qt5QmlDevTools/Qt5QmlDevToolsConfigVersion.cmake qt5/lib/cmake/Qt5Quick/Qt5QuickConfig.cmake qt5/lib/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake @@ -581,7 +675,6 @@ qt5/lib/pkgconfig/Qt5QuickTest.pc qt5/lib/pkgconfig/Qt5QuickWidgets.pc qt5/mkspecs/modules/qt_lib_qml.pri qt5/mkspecs/modules/qt_lib_qml_private.pri -qt5/mkspecs/modules/qt_lib_qmldevtools.pri qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri qt5/mkspecs/modules/qt_lib_qmltest.pri qt5/mkspecs/modules/qt_lib_qmltest_private.pri @@ -599,6 +692,7 @@ qt5/qml/Qt/labs/settings/libqmlsettingsplugin.la qt5/qml/Qt/labs/settings/plugins.qmltypes qt5/qml/Qt/labs/settings/qmldir qt5/qml/QtQml/Models.2/libmodelsplugin.la +qt5/qml/QtQml/Models.2/plugins.qmltypes qt5/qml/QtQml/Models.2/qmldir qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.la qt5/qml/QtQml/StateMachine/plugins.qmltypes diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk index 083e316a206..44863db9d9e 100644 --- a/x11/qt5-qtdeclarative/buildlink3.mk +++ b/x11/qt5-qtdeclarative/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:03:59 adam Exp $ BUILDLINK_TREE+= qt5-qtdeclarative .if !defined(QT5_QTDECLARATIVE_BUILDLINK3_MK) QT5_QTDECLARATIVE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo index 6765f030801..d76d7d978b4 100644 --- a/x11/qt5-qtdeclarative/distinfo +++ b/x11/qt5-qtdeclarative/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.2 2015/02/19 22:29:18 joerg Exp $ +$NetBSD: distinfo,v 1.3 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtdeclarative-opensource-src-5.4.0.tar.xz) = 12c12d50c71cfb1f18c7fabfabe4ad4b364b09fe -RMD160 (qtdeclarative-opensource-src-5.4.0.tar.xz) = b2c19c9bf472f375d78358b11042823964b42774 -Size (qtdeclarative-opensource-src-5.4.0.tar.xz) = 18401844 bytes +SHA1 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 57206b9ffe0485bfd35c0aad85737fb4a7b77c8b +RMD160 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 1d8939c42f4b510443365479ffe8bc525e0faac6 +SHA512 (qtdeclarative-opensource-src-5.5.1.tar.xz) = e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf +Size (qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840 bytes SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d SHA1 (patch-src_3rdparty_masm_wtf_MathExtras.h) = 4b86cfe54867a376ea6267e53566e457b577de7b -SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 05c365003ae8e83a34b3a51ecb3164f55b8e8809 -SHA1 (patch-src_qml_jsruntime_qv4globalobject.cpp) = 814b0caf6356d687e96e7e4f1ffcc85e64c86348 -SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 647ee5cabb5e63a89c5c49db8d19be05556cf3cf +SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 6ee219c0606a2d8e0134cf07891e712800278e18 +SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 600955fcc1e0dfabe83ada9761a9a6f7e847b8a0 diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp index 3974825c7c0..03f1587b066 100644 --- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp +++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp @@ -1,18 +1,20 @@ -$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $ Get stack address/size on SunOS. ---- src/qml/jsruntime/qv4engine.cpp.orig 2014-09-11 10:48:29.000000000 +0000 +--- src/qml/jsruntime/qv4engine.cpp.orig 2015-06-29 20:12:38.000000000 +0000 +++ src/qml/jsruntime/qv4engine.cpp -@@ -118,11 +118,17 @@ quintptr getStackLimit() - pthread_attr_t attr; +@@ -136,13 +136,19 @@ quintptr getStackLimit() #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) - if (pthread_attr_get_np(pthread_self(), &attr) == 0) { + // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes + if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { -#else +#elif !OS(SOLARIS) if (pthread_getattr_np(pthread_self(), &attr) == 0) { #endif + void *stackBottom = Q_NULLPTR; size_t stackSize = 0; + +#if OS(SOLARIS) + pthread_attr_init(&attr); + pthread_attr_getstackaddr(&attr, &stackBottom); diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp deleted file mode 100644 index a3c70a6b06a..00000000000 --- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_qml_jsruntime_qv4globalobject.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $ - -Avoid "error: call of overloaded <func> is ambiguous" - ---- src/qml/jsruntime/qv4globalobject.cpp.orig 2014-02-01 20:38:02.000000000 +0000 -+++ src/qml/jsruntime/qv4globalobject.cpp -@@ -534,7 +534,7 @@ ReturnedValue GlobalFunctions::method_pa - } - - if (overflow) { -- double result = (double) v_overflow * pow(R, overflow_digit_count); -+ double result = (double) v_overflow * pow((double)R, overflow_digit_count); - result += v; - return Encode(sign * result); - } else { diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro index 4d1f1a26d5f..ae2b8a5c721 100644 --- a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro +++ b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro @@ -1,17 +1,17 @@ -$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.2 2015/10/26 19:03:59 adam Exp $ * Create libQtQmlDevTools.so for qttools. ---- src/qmldevtools/qmldevtools.pro.orig 2014-09-11 10:48:29.000000000 +0000 +--- src/qmldevtools/qmldevtools.pro.orig 2015-06-29 20:12:36.000000000 +0000 +++ src/qmldevtools/qmldevtools.pro @@ -1,7 +1,8 @@ -option(host_build) TARGET = QtQmlDevTools QT = core --CONFIG += static no_module_headers internal_module qmldevtools_build -+CONFIG += no_module_headers qmldevtools_build +-CONFIG += static internal_module qmldevtools_build ++CONFIG += internal_module qmldevtools_build +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target - MODULE_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE \ + # Don't use pch because the auto-generated header refers to QtBootstrap, + # which doesn't exist diff --git a/x11/qt5-qtdoc/Makefile b/x11/qt5-qtdoc/Makefile index 27333ec42b0..afa8738d89a 100644 --- a/x11/qt5-qtdoc/Makefile +++ b/x11/qt5-qtdoc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2015/10/10 01:58:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtdoc-opensource-src-${QTVERSION} PKGNAME= qt5-qtdoc-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 documentations MAKE_ENV+= QTDIR=${QTDIR} diff --git a/x11/qt5-qtdoc/PLIST b/x11/qt5-qtdoc/PLIST index 83fdc360c54..6a9a3dd5a96 100644 --- a/x11/qt5-qtdoc/PLIST +++ b/x11/qt5-qtdoc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:46 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:03:59 adam Exp $ qt5/doc/qtdoc.qch qt5/doc/qtdoc/3rdparty.html qt5/doc/qtdoc/accelerators.html @@ -17,11 +17,6 @@ qt5/doc/qtdoc/annotated.html qt5/doc/qtdoc/appicon.html qt5/doc/qtdoc/atomic-operations.html qt5/doc/qtdoc/best-practices.html -qt5/doc/qtdoc/blackberry-support.html -qt5/doc/qtdoc/blackberryappdeploy.html -qt5/doc/qtdoc/blackberrybuild.html -qt5/doc/qtdoc/blackberrygs.html -qt5/doc/qtdoc/blackberryqt5.html qt5/doc/qtdoc/bughowto.html qt5/doc/qtdoc/build-sources.html qt5/doc/qtdoc/building-from-source-ios.html @@ -73,6 +68,12 @@ qt5/doc/qtdoc/images/btn_next.png qt5/doc/qtdoc/images/btn_prev.png qt5/doc/qtdoc/images/bullet_dn.png qt5/doc/qtdoc/images/bullet_sq.png +qt5/doc/qtdoc/images/controlstexteditor_designer.png +qt5/doc/qtdoc/images/controlstexteditor_main.png +qt5/doc/qtdoc/images/controlstexteditor_navigator.png +qt5/doc/qtdoc/images/controlstexteditor_newproperties.png +qt5/doc/qtdoc/images/controlstexteditor_openproperties.png +qt5/doc/qtdoc/images/controlstexteditor_rowproperties.png qt5/doc/qtdoc/images/deployment-mac-application.png qt5/doc/qtdoc/images/deployment-mac-bundlestructure.png qt5/doc/qtdoc/images/deployment-windows-depends.png @@ -123,6 +124,7 @@ qt5/doc/qtdoc/images/qt5_particles.jpg qt5/doc/qtdoc/images/qt5_shadereffect.jpg qt5/doc/qtdoc/images/qt5_video.jpg qt5/doc/qtdoc/images/qt5_widgets.jpg +qt5/doc/qtdoc/images/qtcreator-run.png qt5/doc/qtdoc/images/qtpositioning_weatherinfo_ex.jpg qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-android.png qt5/doc/qtdoc/images/qtquickcontrols-example-gallery-osx.png @@ -162,6 +164,7 @@ qt5/doc/qtdoc/newclasses51.html qt5/doc/qtdoc/newclasses52.html qt5/doc/qtdoc/newclasses53.html qt5/doc/qtdoc/newclasses54.html +qt5/doc/qtdoc/newclasses55.html qt5/doc/qtdoc/obsoleteclasses.html qt5/doc/qtdoc/obsoleteqmltypes.html qt5/doc/qtdoc/opensourcelicense.html @@ -174,7 +177,6 @@ qt5/doc/qtdoc/osx.html qt5/doc/qtdoc/overviews-main.html qt5/doc/qtdoc/overviews.html qt5/doc/qtdoc/platform-notes-android.html -qt5/doc/qtdoc/platform-notes-blackberry.html qt5/doc/qtdoc/platform-notes-integrity.html qt5/doc/qtdoc/platform-notes-ios.html qt5/doc/qtdoc/platform-notes-qnx.html @@ -225,6 +227,10 @@ qt5/doc/qtdoc/qtquick-usecase-styling.html qt5/doc/qtdoc/qtquick-usecase-text.html qt5/doc/qtdoc/qtquick-usecase-userinput.html qt5/doc/qtdoc/qtquick-usecase-visual.html +qt5/doc/qtdoc/qtquickcontrols-texteditor-action.html +qt5/doc/qtdoc/qtquickcontrols-texteditor-logic.html +qt5/doc/qtdoc/qtquickcontrols-texteditor-ui.html +qt5/doc/qtdoc/qtquickcontrols-texteditor.html qt5/doc/qtdoc/qundo.html qt5/doc/qtdoc/rcc.html qt5/doc/qtdoc/reference-overview.html @@ -269,6 +275,7 @@ qt5/doc/qtdoc/whatsnew51.html qt5/doc/qtdoc/whatsnew52.html qt5/doc/qtdoc/whatsnew53.html qt5/doc/qtdoc/whatsnew54.html +qt5/doc/qtdoc/whatsnew55.html qt5/doc/qtdoc/why-moc.html qt5/doc/qtdoc/wince-with-qt-introduction.html qt5/doc/qtdoc/windows-building.html diff --git a/x11/qt5-qtdoc/distinfo b/x11/qt5-qtdoc/distinfo index 2d0548b841a..35fc4c414c0 100644 --- a/x11/qt5-qtdoc/distinfo +++ b/x11/qt5-qtdoc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtdoc-opensource-src-5.4.0.tar.xz) = 38dccc28e50525301634eaeaa2c20d71c3938f7a -RMD160 (qtdoc-opensource-src-5.4.0.tar.xz) = e10c7bb33fa44453560eed00feedb025a1132c75 -Size (qtdoc-opensource-src-5.4.0.tar.xz) = 16049796 bytes +SHA1 (qtdoc-opensource-src-5.5.1.tar.xz) = 6ddf19ac4f6945221d1ccb4ae76ee8a18d207067 +RMD160 (qtdoc-opensource-src-5.5.1.tar.xz) = 907fc8eefba4e2c836143474f9abd99c0b0bf79f +SHA512 (qtdoc-opensource-src-5.5.1.tar.xz) = 0eb2756bcc72d65ba743ed1a26827d62e9bfc9856b35dbcea869b22a339c1ca614bd8f221d66e046a38e8f283b984613bba232c491ecd4117d8dd23a2267b54c +Size (qtdoc-opensource-src-5.5.1.tar.xz) = 2669772 bytes diff --git a/x11/qt5-qtgraphicaleffects/Makefile b/x11/qt5-qtgraphicaleffects/Makefile index 398ac265f40..4165b295b0c 100644 --- a/x11/qt5-qtgraphicaleffects/Makefile +++ b/x11/qt5-qtgraphicaleffects/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:58:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtgraphicaleffects-opensource-src-${QTVERSION} PKGNAME= qt5-qtgraphicaleffects-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for Graphics effects BUILD_TARGET= sub-src diff --git a/x11/qt5-qtgraphicaleffects/distinfo b/x11/qt5-qtgraphicaleffects/distinfo index 94543051b7b..5c09d105437 100644 --- a/x11/qt5-qtgraphicaleffects/distinfo +++ b/x11/qt5-qtgraphicaleffects/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:24:50 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtgraphicaleffects-opensource-src-5.4.0.tar.xz) = b83755ae9457d7a43691e6668a7f7330ff373bdf -RMD160 (qtgraphicaleffects-opensource-src-5.4.0.tar.xz) = 94472cf795485ba2dbebb54b679dabbc55c8b116 -Size (qtgraphicaleffects-opensource-src-5.4.0.tar.xz) = 14323556 bytes +SHA1 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9a6b6211f507dafb7d995b5cbf390beb18a77c2b +RMD160 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 43f6a91f75863f8333fc6b70456f1b0d175b55e4 +SHA512 (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = b01ca47e68ce3653d1e203199b5e770f37c49e243233a1a4560cec22c7f10553934e28fbbea49ae5464ed68b4ab6387e5499c2b5277a44b571f6d963bf2caee1 +Size (qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444 bytes diff --git a/x11/qt5-qtimageformats/Makefile b/x11/qt5-qtimageformats/Makefile index d7514fd1cbd..789480b0e05 100644 --- a/x11/qt5-qtimageformats/Makefile +++ b/x11/qt5-qtimageformats/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:03:59 adam Exp $ DISTNAME= qtimageformats-opensource-src-${QTVERSION} PKGNAME= qt5-qtimageformats-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for Image formats BUILD_TARGET= sub-src diff --git a/x11/qt5-qtimageformats/buildlink3.mk b/x11/qt5-qtimageformats/buildlink3.mk index f1cb1646276..82dbedc14e3 100644 --- a/x11/qt5-qtimageformats/buildlink3.mk +++ b/x11/qt5-qtimageformats/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:03:59 adam Exp $ BUILDLINK_TREE+= qt5-qtimageformats .if !defined(QT5_QTIMAGEFORMATS_BUILDLINK3_MK) QT5_QTIMAGEFORMATS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtimageformats+= qt5-qtimageformats>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtimageformats?= ../../x11/qt5-qtimageformats BUILDLINK_INCDIRS.qt5-qtimageformats+= qt5/include diff --git a/x11/qt5-qtimageformats/distinfo b/x11/qt5-qtimageformats/distinfo index ba20154cfa9..4b1b3af28d6 100644 --- a/x11/qt5-qtimageformats/distinfo +++ b/x11/qt5-qtimageformats/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:03:59 adam Exp $ -SHA1 (qtimageformats-opensource-src-5.4.0.tar.xz) = 6590b61c51a186837c3d2058d8192886d970f92a -RMD160 (qtimageformats-opensource-src-5.4.0.tar.xz) = b907cf6bcfec01bf99c5c98f00ee6c14f17b27a1 -Size (qtimageformats-opensource-src-5.4.0.tar.xz) = 2104452 bytes +SHA1 (qtimageformats-opensource-src-5.5.1.tar.xz) = e454791169abf781c412c087f26a9338deaca979 +RMD160 (qtimageformats-opensource-src-5.5.1.tar.xz) = 75000000ddfbb83b960b73c07d2083b85dcd81fa +SHA512 (qtimageformats-opensource-src-5.5.1.tar.xz) = cee25ebf12d8e95c9539aa3b8d6f464f65fbceb1c637961bd2fd997ae803a5fda4b9a2ad96fe406cfa95609213f0ce9f2c82dba6ccc7413217b4e1a2f99a8049 +Size (qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820 bytes diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile index c9cfbec7115..86f1934e514 100644 --- a/x11/qt5-qtlocation/Makefile +++ b/x11/qt5-qtlocation/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtlocation-opensource-src-${QTVERSION} PKGNAME= qt5-qtlocation-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for qtlocation BUILD_TARGET= sub-src diff --git a/x11/qt5-qtlocation/PLIST b/x11/qt5-qtlocation/PLIST index f34eb03711d..cd7d78cb997 100644 --- a/x11/qt5-qtlocation/PLIST +++ b/x11/qt5-qtlocation/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:46 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5Positioning.pc qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qcache3q_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameracapabilities_p.h @@ -9,9 +9,8 @@ qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanager_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanagerengine_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaneuver_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapcontroller_p.h -qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p.h -qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p.h @@ -27,8 +26,8 @@ qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanager_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanagerengine_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoserviceprovider_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilecache_p.h -qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p.h -qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmap_p.h +qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmap_p_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p.h @@ -192,6 +191,7 @@ qt5/include/QtPositioning/qpositioningglobal.h qt5/include/QtPositioning/qtpositioningversion.h qt5/lib/cmake/Qt5Location/Qt5LocationConfig.cmake qt5/lib/cmake/Qt5Location/Qt5LocationConfigVersion.cmake +qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfig.cmake @@ -207,6 +207,7 @@ qt5/mkspecs/modules/qt_lib_location.pri qt5/mkspecs/modules/qt_lib_location_private.pri qt5/mkspecs/modules/qt_lib_positioning.pri qt5/mkspecs/modules/qt_lib_positioning_private.pri +qt5/plugins/geoservices/libqtgeoservices_mapbox.la qt5/plugins/geoservices/libqtgeoservices_nokia.la qt5/plugins/geoservices/libqtgeoservices_osm.la qt5/plugins/position/libqtposition_positionpoll.la diff --git a/x11/qt5-qtlocation/buildlink3.mk b/x11/qt5-qtlocation/buildlink3.mk index cde38bbcb5a..02c361f1354 100644 --- a/x11/qt5-qtlocation/buildlink3.mk +++ b/x11/qt5-qtlocation/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtlocation .if !defined(QT5_QTLOCATION_BUILDLINK3_MK) QT5_QTLOCATION_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtlocation+= qt5-qtlocation>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtlocation?= ../../x11/qt5-qtlocation BUILDLINK_INCDIRS.qt5-qtlocation+= qt5/include diff --git a/x11/qt5-qtlocation/distinfo b/x11/qt5-qtlocation/distinfo index 301dbd6f8ee..d65ee193805 100644 --- a/x11/qt5-qtlocation/distinfo +++ b/x11/qt5-qtlocation/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtlocation-opensource-src-5.4.0.tar.xz) = c47e80c4282f96de843d90341f93cd0f48333284 -RMD160 (qtlocation-opensource-src-5.4.0.tar.xz) = 575c3660a81fc285b331a23d49df43dd5d070006 -Size (qtlocation-opensource-src-5.4.0.tar.xz) = 3297720 bytes +SHA1 (qtlocation-opensource-src-5.5.1.tar.xz) = 700bf32e15c7d808e71bca7b908b08111e81eda4 +RMD160 (qtlocation-opensource-src-5.5.1.tar.xz) = 3792eedc159db6bf15eef706ee218f3cc5759a51 +SHA512 (qtlocation-opensource-src-5.5.1.tar.xz) = d7b1563fdfdb628e78f5a1cdd7c381221888370f96446d47eedb1bc4dbbffb512bc336940f0fc6b65501c2d8ff81eff153512ff231c74e760907122683172ba2 +Size (qtlocation-opensource-src-5.5.1.tar.xz) = 3108096 bytes diff --git a/x11/qt5-qtmacextras/Makefile b/x11/qt5-qtmacextras/Makefile index b326cc73cef..60205cc12df 100644 --- a/x11/qt5-qtmacextras/Makefile +++ b/x11/qt5-qtmacextras/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2015/10/10 01:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtmacextras-opensource-src-${QTVERSION} PKGNAME= qt5-qtmacextras-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for Mac extras BUILD_TARGET= sub-src diff --git a/x11/qt5-qtmacextras/buildlink3.mk b/x11/qt5-qtmacextras/buildlink3.mk index b2ed5db3328..1940e77a1b4 100644 --- a/x11/qt5-qtmacextras/buildlink3.mk +++ b/x11/qt5-qtmacextras/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtmacextras .if !defined(QT5_QTMACEXTRAS_BUILDLINK3_MK) QT5_QTMACEXTRAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtmacextras+= qt5-qtmacextras>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtmacextras?= ../../x11/qt5-qtmacextras BUILDLINK_INCDIRS.qt5-qtmacextras+= qt5/include diff --git a/x11/qt5-qtmacextras/distinfo b/x11/qt5-qtmacextras/distinfo index 336a62aedb7..61b469e21b0 100644 --- a/x11/qt5-qtmacextras/distinfo +++ b/x11/qt5-qtmacextras/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtmacextras-opensource-src-5.4.0.tar.xz) = 0502d71f1f2fef71f428bdde0aff734c2fc4b382 -RMD160 (qtmacextras-opensource-src-5.4.0.tar.xz) = 726b7f8f3172d511955259eb6b63d6fa6eff27a3 -Size (qtmacextras-opensource-src-5.4.0.tar.xz) = 38424 bytes +SHA1 (qtmacextras-opensource-src-5.5.1.tar.xz) = bd42e329ae70585e746edff70ce594ca486fc8d3 +RMD160 (qtmacextras-opensource-src-5.5.1.tar.xz) = e31be686e79c1cf4a70357921f0caad4cd496c79 +SHA512 (qtmacextras-opensource-src-5.5.1.tar.xz) = a132e2e4227b27625ac550d9cee4e1d4c334f69026d74b8e86444501afdb3165a2dd7f7f8ffe97a251792c263c1164505e21c0749cc4cc606cefc3ce51787f30 +Size (qtmacextras-opensource-src-5.5.1.tar.xz) = 46312 bytes diff --git a/x11/qt5-qtmultimedia/Makefile b/x11/qt5-qtmultimedia/Makefile index e91954dbe96..6c269ac7df2 100644 --- a/x11/qt5-qtmultimedia/Makefile +++ b/x11/qt5-qtmultimedia/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtmultimedia-opensource-src-${QTVERSION} PKGNAME= qt5-qtmultimedia-${QTVERSION} -PKGREVISION= 7 COMMENT= Qt5 module for multimedia BUILD_TARGET= sub-src @@ -31,7 +30,7 @@ PLIST.alsa= yes .if ${OPSYS} != "Darwin" .include "../../audio/openal/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.include "../../multimedia/gst-plugins1-base/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 f138b6c6d54..44027fc855c 100644 --- a/x11/qt5-qtmultimedia/PLIST +++ b/x11/qt5-qtmultimedia/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2015/08/30 04:17:15 markd Exp $ +@comment $NetBSD: PLIST,v 1.10 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5Multimedia.pc lib/pkgconfig/Qt5MultimediaQuick_p.pc lib/pkgconfig/Qt5MultimediaWidgets.pc @@ -16,10 +16,13 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstbufferpoolinterf qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstcodecsinfo_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioinputselector_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreameraudioprobecontrol_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbufferprobe_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamerbushelper_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamergltexturerenderer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermessage_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamermirtexturerenderer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideooverlay_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideoprobecontrol_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorenderer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideorendererinterface_p.h @@ -27,6 +30,8 @@ qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowidge qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstreamervideowindow_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstutils_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideobuffer_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideorendererplugin_p.h +qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qgstvideorenderersink_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qimagevideobuffer_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmediacontrol_p.h qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qmedianetworkplaylistprovider_p.h @@ -61,6 +66,7 @@ qt5/include/QtMultimedia/QAbstractAudioInput qt5/include/QtMultimedia/QAbstractAudioOutput qt5/include/QtMultimedia/QAbstractPlanarVideoBuffer qt5/include/QtMultimedia/QAbstractVideoBuffer +qt5/include/QtMultimedia/QAbstractVideoFilter qt5/include/QtMultimedia/QAbstractVideoSurface qt5/include/QtMultimedia/QAudio qt5/include/QtMultimedia/QAudioBuffer @@ -97,7 +103,9 @@ qt5/include/QtMultimedia/QCameraImageProcessingControl qt5/include/QtMultimedia/QCameraInfo qt5/include/QtMultimedia/QCameraInfoControl qt5/include/QtMultimedia/QCameraLocksControl +qt5/include/QtMultimedia/QCameraViewfinderSettings qt5/include/QtMultimedia/QCameraViewfinderSettingsControl +qt5/include/QtMultimedia/QCameraViewfinderSettingsControl2 qt5/include/QtMultimedia/QCameraZoomControl qt5/include/QtMultimedia/QImageEncoderControl qt5/include/QtMultimedia/QImageEncoderSettings @@ -143,6 +151,7 @@ qt5/include/QtMultimedia/QSoundEffect qt5/include/QtMultimedia/QVideoDeviceSelectorControl qt5/include/QtMultimedia/QVideoEncoderSettings qt5/include/QtMultimedia/QVideoEncoderSettingsControl +qt5/include/QtMultimedia/QVideoFilterRunnable qt5/include/QtMultimedia/QVideoFrame qt5/include/QtMultimedia/QVideoProbe qt5/include/QtMultimedia/QVideoRendererControl @@ -152,6 +161,7 @@ qt5/include/QtMultimedia/QtMultimedia qt5/include/QtMultimedia/QtMultimediaDepends qt5/include/QtMultimedia/QtMultimediaVersion qt5/include/QtMultimedia/qabstractvideobuffer.h +qt5/include/QtMultimedia/qabstractvideofilter.h qt5/include/QtMultimedia/qabstractvideosurface.h qt5/include/QtMultimedia/qaudio.h qt5/include/QtMultimedia/qaudiobuffer.h @@ -185,6 +195,7 @@ qt5/include/QtMultimedia/qcameraimageprocessingcontrol.h qt5/include/QtMultimedia/qcamerainfo.h qt5/include/QtMultimedia/qcamerainfocontrol.h qt5/include/QtMultimedia/qcameralockscontrol.h +qt5/include/QtMultimedia/qcameraviewfindersettings.h qt5/include/QtMultimedia/qcameraviewfindersettingscontrol.h qt5/include/QtMultimedia/qcamerazoomcontrol.h qt5/include/QtMultimedia/qimageencodercontrol.h @@ -231,18 +242,18 @@ qt5/include/QtMultimedia/qvideosurfaceformat.h qt5/include/QtMultimedia/qvideowindowcontrol.h qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h qt5/include/QtMultimediaQuick_p/${PKGVERSION}/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h -qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture -qt5/include/QtMultimediaQuick_p/QSGVideoNode_I420 +qt5/include/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV qt5/include/QtMultimediaQuick_p/QSGVideoNode_RGB qt5/include/QtMultimediaQuick_p/QSGVideoNode_Texture +qt5/include/QtMultimediaQuick_p/QSGVideoNode_YUV qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_p qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pDepends qt5/include/QtMultimediaQuick_p/QtMultimediaQuick_pVersion -qt5/include/QtMultimediaQuick_p/qsgvideonode_i420.h qt5/include/QtMultimediaQuick_p/qsgvideonode_rgb.h qt5/include/QtMultimediaQuick_p/qsgvideonode_texture.h +qt5/include/QtMultimediaQuick_p/qsgvideonode_yuv.h qt5/include/QtMultimediaQuick_p/qtmultimediaquick_pversion.h qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h qt5/include/QtMultimediaWidgets/${PKGVERSION}/QtMultimediaWidgets/private/qpaintervideosurface_p.h diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk index ee16d77d1f0..f662d2ea279 100644 --- a/x11/qt5-qtmultimedia/buildlink3.mk +++ b/x11/qt5-qtmultimedia/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.12 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtmultimedia .if !defined(QT5_QTMULTIMEDIA_BUILDLINK3_MK) QT5_QTMULTIMEDIA_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.4.0nb5 +BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include @@ -16,7 +16,7 @@ BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/plugins .if ${OPSYS} != "Darwin" .include "../../audio/openal/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" -.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" +.include "../../multimedia/gst-plugins1-base/buildlink3.mk" .endif .include "../../x11/qt5-qtdeclarative/buildlink3.mk" .endif # QT5_QTMULTIMEDIA_BUILDLINK3_MK diff --git a/x11/qt5-qtmultimedia/distinfo b/x11/qt5-qtmultimedia/distinfo index b19b2675737..76357a9c09d 100644 --- a/x11/qt5-qtmultimedia/distinfo +++ b/x11/qt5-qtmultimedia/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtmultimedia-opensource-src-5.4.0.tar.xz) = a66fe5538f554957f60fc160121a3b0e7e72753b -RMD160 (qtmultimedia-opensource-src-5.4.0.tar.xz) = b2e0db7dbc711417df91fed21a6b8b12ee948c9c -Size (qtmultimedia-opensource-src-5.4.0.tar.xz) = 3188824 bytes +SHA1 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 734cdbd0c365ccdf958ad8957e2a8f86492425b7 +RMD160 (qtmultimedia-opensource-src-5.5.1.tar.xz) = 68049da5e203e484de766c17d683a34a888e0603 +SHA512 (qtmultimedia-opensource-src-5.5.1.tar.xz) = e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0 +Size (qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340 bytes +SHA1 (patch-qtmultimedia.pro) = 70ef4ab962f117a7539c352bc5467ae057524a8a diff --git a/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro b/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro new file mode 100644 index 00000000000..abddb568a56 --- /dev/null +++ b/x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro @@ -0,0 +1,26 @@ +$NetBSD: patch-qtmultimedia.pro,v 1.1 2015/10/26 19:04:00 adam Exp $ + +Try to configure audio modules, despite QT_CONFIG set in qt5-qtbase. + +--- qtmultimedia.pro.orig 2015-10-26 17:52:59.000000000 +0000 ++++ qtmultimedia.pro +@@ -15,16 +15,10 @@ win32 { + } else:qnx { + qtCompileTest(mmrenderer) + } else:!android { +- contains(QT_CONFIG, alsa):qtCompileTest(alsa) +- contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) ++ qtCompileTest(alsa) ++ qtCompileTest(pulseaudio) + +- isEmpty(GST_VERSION) { +- contains(QT_CONFIG, gstreamer-0.10) { +- GST_VERSION = 0.10 +- } else: contains(QT_CONFIG, gstreamer-1.0) { +- GST_VERSION = 1.0 +- } +- } ++ GST_VERSION = 1.0 + cache(GST_VERSION, set) + !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) diff --git a/x11/qt5-qtquick1/Makefile b/x11/qt5-qtquick1/Makefile index 3e104c20256..4f32f40f925 100644 --- a/x11/qt5-qtquick1/Makefile +++ b/x11/qt5-qtquick1/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtquick1-opensource-src-${QTVERSION} PKGNAME= qt5-qtquick1-${QTVERSION} -PKGREVISION= 5 COMMENT= Qt5 module for Quick1 BUILD_TARGET= sub-tools diff --git a/x11/qt5-qtquick1/PLIST b/x11/qt5-qtquick1/PLIST index 58d522758f2..3ca28319883 100644 --- a/x11/qt5-qtquick1/PLIST +++ b/x11/qt5-qtquick1/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5Declarative.pc ${PLIST.mac}qt5/bin/QMLViewer +${PLIST.unix}qt5/bin/qmlviewer qt5/bin/qml1plugindump -qt5/bin/qmlviewer qt5/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la qt5/imports/Qt/labs/folderlistmodel/plugins.qmltypes qt5/imports/Qt/labs/folderlistmodel/qmldir diff --git a/x11/qt5-qtquick1/buildlink3.mk b/x11/qt5-qtquick1/buildlink3.mk index 6a1d6a4f4c1..0584662549d 100644 --- a/x11/qt5-qtquick1/buildlink3.mk +++ b/x11/qt5-qtquick1/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.14 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtquick1 .if !defined(QT5_QTQUICK1_BUILDLINK3_MK) QT5_QTQUICK1_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.4.0nb4 +BUILDLINK_API_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtquick1+= qt5-qtquick1>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtquick1?= ../../x11/qt5-qtquick1 BUILDLINK_INCDIRS.qt5-qtquick1+= qt5/include diff --git a/x11/qt5-qtquick1/distinfo b/x11/qt5-qtquick1/distinfo index 45cad754005..57e22159027 100644 --- a/x11/qt5-qtquick1/distinfo +++ b/x11/qt5-qtquick1/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtquick1-opensource-src-5.4.0.tar.xz) = d4af107f1227f111b7a65924d2ce5e3c08c7ee20 -RMD160 (qtquick1-opensource-src-5.4.0.tar.xz) = b3241866d7a79b22287d29d8002ec8f2c709d01e -Size (qtquick1-opensource-src-5.4.0.tar.xz) = 15982676 bytes +SHA1 (qtquick1-opensource-src-5.5.1.tar.xz) = b2cbe02abc8e80ec33c31dd3b641a2ebe4326cef +RMD160 (qtquick1-opensource-src-5.5.1.tar.xz) = dd1c71468426a5b9fe4f5297a6f2b04c9caddc78 +SHA512 (qtquick1-opensource-src-5.5.1.tar.xz) = dda4ae2af3cccbced78cb98cb3f1cd1f00a6944da9629e3064454f3c0fdbdf5131ca6833c2247807326216a9fecd9f11f6535bf69f9542e41ffce12f75f44fc2 +Size (qtquick1-opensource-src-5.5.1.tar.xz) = 16028732 bytes SHA1 (patch-tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = a8b96ccfdda1b7cb617c67fad6e8d6c821e7e882 diff --git a/x11/qt5-qtquickcontrols/Makefile b/x11/qt5-qtquickcontrols/Makefile index 427b7c6e783..fd655e8fa7e 100644 --- a/x11/qt5-qtquickcontrols/Makefile +++ b/x11/qt5-qtquickcontrols/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtquickcontrols-opensource-src-${QTVERSION} PKGNAME= qt5-qtquickcontrols-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for QuickControls BUILD_TARGET= sub-src diff --git a/x11/qt5-qtquickcontrols/PLIST b/x11/qt5-qtquickcontrols/PLIST index 41889c2f7c7..78419755c8b 100644 --- a/x11/qt5-qtquickcontrols/PLIST +++ b/x11/qt5-qtquickcontrols/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:00 adam Exp $ qt5/qml/QtQuick/Controls/ApplicationWindow.qml qt5/qml/QtQuick/Controls/BusyIndicator.qml qt5/qml/QtQuick/Controls/Button.qml @@ -11,6 +11,7 @@ qt5/qml/QtQuick/Controls/Menu.qml qt5/qml/QtQuick/Controls/MenuBar.qml qt5/qml/QtQuick/Controls/Private/AbstractCheckable.qml qt5/qml/QtQuick/Controls/Private/BasicButton.qml +qt5/qml/QtQuick/Controls/Private/BasicTableView.qml qt5/qml/QtQuick/Controls/Private/CalendarHeaderModel.qml qt5/qml/QtQuick/Controls/Private/CalendarUtils.js qt5/qml/QtQuick/Controls/Private/ColumnMenuContent.qml @@ -34,11 +35,13 @@ qt5/qml/QtQuick/Controls/Private/StackViewSlideDelegate.qml qt5/qml/QtQuick/Controls/Private/Style.qml qt5/qml/QtQuick/Controls/Private/SystemPaletteSingleton.qml qt5/qml/QtQuick/Controls/Private/TabBar.qml +qt5/qml/QtQuick/Controls/Private/TableViewItemDelegateLoader.qml qt5/qml/QtQuick/Controls/Private/TableViewSelection.qml qt5/qml/QtQuick/Controls/Private/TextHandle.qml qt5/qml/QtQuick/Controls/Private/TextInputWithHandles.qml qt5/qml/QtQuick/Controls/Private/TextSingleton.qml qt5/qml/QtQuick/Controls/Private/ToolMenuButton.qml +qt5/qml/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml qt5/qml/QtQuick/Controls/Private/qmldir qt5/qml/QtQuick/Controls/Private/style.js qt5/qml/QtQuick/Controls/ProgressBar.qml @@ -52,28 +55,43 @@ qt5/qml/QtQuick/Controls/StackViewDelegate.qml qt5/qml/QtQuick/Controls/StackViewTransition.qml qt5/qml/QtQuick/Controls/StatusBar.qml qt5/qml/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ButtonStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/CalendarStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/CircularButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/CommonStyleHelper.qml +qt5/qml/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/DialStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/GaugeStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/GroupBoxStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/HandleStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/HandleStyleHelper.qml qt5/qml/QtQuick/Controls/Styles/Base/MenuBarStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/MenuStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/PieMenuStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ProgressBarStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/RadioButtonStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/SliderStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/SpinBoxStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/StatusBarStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/SwitchStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/TabViewStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/TableViewStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/TextAreaStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/TextFieldStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ToolBarStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/ToolButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/TreeViewStyle.qml +qt5/qml/QtQuick/Controls/Styles/Base/TumblerStyle.qml qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-down.png qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-down@2x.png qt5/qml/QtQuick/Controls/Styles/Base/images/arrow-left.png @@ -90,7 +108,9 @@ qt5/qml/QtQuick/Controls/Styles/Base/images/editbox.png qt5/qml/QtQuick/Controls/Styles/Base/images/focusframe.png qt5/qml/QtQuick/Controls/Styles/Base/images/groupbox.png qt5/qml/QtQuick/Controls/Styles/Base/images/header.png +qt5/qml/QtQuick/Controls/Styles/Base/images/knob.png qt5/qml/QtQuick/Controls/Styles/Base/images/leftanglearrow.png +qt5/qml/QtQuick/Controls/Styles/Base/images/needle.png qt5/qml/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png qt5/qml/QtQuick/Controls/Styles/Base/images/rightanglearrow.png qt5/qml/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png @@ -127,7 +147,10 @@ qt5/qml/QtQuick/Controls/Styles/Desktop/TextAreaStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml +qt5/qml/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml qt5/qml/QtQuick/Controls/Styles/Desktop/qmldir +qt5/qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.la +qt5/qml/QtQuick/Controls/Styles/Flat/qmldir qt5/qml/QtQuick/Controls/Styles/qmldir qt5/qml/QtQuick/Controls/Switch.qml qt5/qml/QtQuick/Controls/Tab.qml @@ -138,6 +161,7 @@ qt5/qml/QtQuick/Controls/TextArea.qml qt5/qml/QtQuick/Controls/TextField.qml qt5/qml/QtQuick/Controls/ToolBar.qml qt5/qml/QtQuick/Controls/ToolButton.qml +qt5/qml/QtQuick/Controls/TreeView.qml qt5/qml/QtQuick/Controls/libqtquickcontrolsplugin.la qt5/qml/QtQuick/Controls/plugins.qmltypes qt5/qml/QtQuick/Controls/qmldir @@ -146,6 +170,36 @@ qt5/qml/QtQuick/Dialogs/Private/qmldir qt5/qml/QtQuick/Dialogs/libdialogplugin.la qt5/qml/QtQuick/Dialogs/plugins.qmltypes qt5/qml/QtQuick/Dialogs/qmldir +qt5/qml/QtQuick/Extras/designer/CircularGaugeSpecifics.qml +qt5/qml/QtQuick/Extras/designer/DelayButtonSpecifics.qml +qt5/qml/QtQuick/Extras/designer/DialSpecifics.qml +qt5/qml/QtQuick/Extras/designer/GaugeSpecifics.qml +qt5/qml/QtQuick/Extras/designer/PictureSpecifics.qml +qt5/qml/QtQuick/Extras/designer/PieMenuSpecifics.qml +qt5/qml/QtQuick/Extras/designer/StatusIndicatorSpecifics.qml +qt5/qml/QtQuick/Extras/designer/ToggleButtonSpecifics.qml +qt5/qml/QtQuick/Extras/designer/images/circulargauge-icon.png +qt5/qml/QtQuick/Extras/designer/images/circulargauge-icon16.png +qt5/qml/QtQuick/Extras/designer/images/delaybutton-icon.png +qt5/qml/QtQuick/Extras/designer/images/delaybutton-icon16.png +qt5/qml/QtQuick/Extras/designer/images/dial-icon.png +qt5/qml/QtQuick/Extras/designer/images/dial-icon16.png +qt5/qml/QtQuick/Extras/designer/images/gauge-icon.png +qt5/qml/QtQuick/Extras/designer/images/gauge-icon16.png +qt5/qml/QtQuick/Extras/designer/images/picture-icon.png +qt5/qml/QtQuick/Extras/designer/images/picture-icon16.png +qt5/qml/QtQuick/Extras/designer/images/piemenu-icon.png +qt5/qml/QtQuick/Extras/designer/images/piemenu-icon16.png +qt5/qml/QtQuick/Extras/designer/images/statusindicator-icon.png +qt5/qml/QtQuick/Extras/designer/images/statusindicator-icon16.png +qt5/qml/QtQuick/Extras/designer/images/togglebutton-icon.png +qt5/qml/QtQuick/Extras/designer/images/togglebutton-icon16.png +qt5/qml/QtQuick/Extras/designer/images/tumbler-icon.png +qt5/qml/QtQuick/Extras/designer/images/tumbler-icon16.png +qt5/qml/QtQuick/Extras/designer/qtquickextras.metainfo +qt5/qml/QtQuick/Extras/libqtquickextrasplugin.la +qt5/qml/QtQuick/Extras/plugins.qmltypes +qt5/qml/QtQuick/Extras/qmldir qt5/qml/QtQuick/Layouts/libqquicklayoutsplugin.la qt5/qml/QtQuick/Layouts/plugins.qmltypes qt5/qml/QtQuick/Layouts/qmldir diff --git a/x11/qt5-qtquickcontrols/buildlink3.mk b/x11/qt5-qtquickcontrols/buildlink3.mk index eff1a83784a..34e6922c8e6 100644 --- a/x11/qt5-qtquickcontrols/buildlink3.mk +++ b/x11/qt5-qtquickcontrols/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtquickcontrols .if !defined(QT5_QTQUICKCONTROLS_BUILDLINK3_MK) QT5_QTQUICKCONTROLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtquickcontrols+= qt5-qtquickcontrols>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtquickcontrols?= ../../x11/qt5-qtquickcontrols BUILDLINK_INCDIRS.qt5-qtquickcontrols+= qt5/include diff --git a/x11/qt5-qtquickcontrols/distinfo b/x11/qt5-qtquickcontrols/distinfo index 8b88a18f4b9..7a77a51b16e 100644 --- a/x11/qt5-qtquickcontrols/distinfo +++ b/x11/qt5-qtquickcontrols/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 1d8dd4a0b1c69e14805c59d4676c8406c65a4114 -RMD160 (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 1baba3e53b80770ff979f7206b8456efcd2ddcae -Size (qtquickcontrols-opensource-src-5.4.0.tar.xz) = 919408 bytes +SHA1 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1a44136fdc925590d74a290d766a730d3e549fef +RMD160 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 3975fbb34a74d55f88f47b436b6fca6ce3f7c078 +SHA512 (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 7abe85f44cb6785bcbb6d8150cd1033e61871fb585a7c19644b51a8951668c937ef7fcdfaf57b008ded525b8f150a0dc6a35f1dc31f5b30c6125179ba67540f2 +Size (qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316 bytes diff --git a/x11/qt5-qtscript/Makefile b/x11/qt5-qtscript/Makefile index 4d90029b227..345c86b55fd 100644 --- a/x11/qt5-qtscript/Makefile +++ b/x11/qt5-qtscript/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtscript-opensource-src-${QTVERSION} PKGNAME= qt5-qtscript-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 module for script BUILD_TARGET= sub-src diff --git a/x11/qt5-qtscript/buildlink3.mk b/x11/qt5-qtscript/buildlink3.mk index 5c9a0ee2b14..e3269f7e650 100644 --- a/x11/qt5-qtscript/buildlink3.mk +++ b/x11/qt5-qtscript/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtscript .if !defined(QT5_QTSCRIPT_BUILDLINK3_MK) QT5_QTSCRIPT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.4.0nb3 +BUILDLINK_API_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtscript+= qt5-qtscript>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtscript?= ../../x11/qt5-qtscript BUILDLINK_INCDIRS.qt5-qtscript+= qt5/include diff --git a/x11/qt5-qtscript/distinfo b/x11/qt5-qtscript/distinfo index c6218825f1c..9196baf9243 100644 --- a/x11/qt5-qtscript/distinfo +++ b/x11/qt5-qtscript/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.2 2015/08/30 10:00:56 markd Exp $ +$NetBSD: distinfo,v 1.3 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtscript-opensource-src-5.4.0.tar.xz) = 7ca8d6ccbc97fb24a9e76b69eeaa5e7e9c321955 -RMD160 (qtscript-opensource-src-5.4.0.tar.xz) = c51fd51c5f3ada72fdd5397ed5fb71d209ecf3a4 -Size (qtscript-opensource-src-5.4.0.tar.xz) = 2579768 bytes -SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = c8044ceaab87091aba1f226e03afa681abad11b0 +SHA1 (qtscript-opensource-src-5.5.1.tar.xz) = e5bb071c43e9c1244d779383c9c72fe0f0564578 +RMD160 (qtscript-opensource-src-5.5.1.tar.xz) = 7d8ff8c4462b21b83212dd780030a01bd00b8ca9 +SHA512 (qtscript-opensource-src-5.5.1.tar.xz) = a520e8593100153b41b9a88ad02afa5b46b743a3662914dc84225475fad1d5189f75ecc84970e26f9291693dc7461417cd9193c9f8e22d3cc4c9e2cc1d0e2371 +Size (qtscript-opensource-src-5.5.1.tar.xz) = 2604884 bytes +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h) = e46033a23803b4e27dcd7f5369730e046ad5e4cb SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = 6672e941f0ecbba35b5b932ab9f7b49a269fb6e6 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = 5467afc8dc5e2f93a267a6ab380bb647c501d145 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_yarr_RegexJIT.h) = bf6a3cbfcd5a237953f5fa6e213faaf5e5153aa8 diff --git a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h index 402c804f145..5f5d275bee4 100644 --- a/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h +++ b/x11/qt5-qtscript/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h @@ -1,15 +1,15 @@ -$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_config.h,v 1.2 2015/10/26 19:04:00 adam Exp $ * Add DragonFly support ---- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2013-11-27 01:00:27.000000000 +0000 +--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2015-10-13 04:35:46.000000000 +0000 +++ src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -53,7 +53,7 @@ #endif --#if OS(FREEBSD) || OS(OPENBSD) -+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY) +-#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__) ++#if (OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)) && !defined(__GLIBC__) #define HAVE_PTHREAD_NP_H 1 #endif diff --git a/x11/qt5-qtsensors/Makefile b/x11/qt5-qtsensors/Makefile index 59852f81125..6b6768cf38c 100644 --- a/x11/qt5-qtsensors/Makefile +++ b/x11/qt5-qtsensors/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtsensors-opensource-src-${QTVERSION} PKGNAME= qt5-qtsensors-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for Sensors BUILD_TARGET= sub-src diff --git a/x11/qt5-qtsensors/PLIST b/x11/qt5-qtsensors/PLIST index 4c3af479aab..16c3eced0ff 100644 --- a/x11/qt5-qtsensors/PLIST +++ b/x11/qt5-qtsensors/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5Sensors.pc qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaccelerometer_p.h qt5/include/QtSensors/${PKGVERSION}/QtSensors/private/qaltimeter_p.h @@ -120,7 +120,6 @@ qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfig.cmake qt5/lib/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake qt5/lib/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake -qt5/lib/cmake/Qt5Sensors/Qt5Sensors_dummySensorPlugin.cmake qt5/lib/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake qt5/lib/libQt5Sensors.la qt5/lib/libQt5Sensors.prl @@ -129,7 +128,6 @@ qt5/mkspecs/modules/qt_lib_sensors.pri qt5/mkspecs/modules/qt_lib_sensors_private.pri qt5/plugins/sensorgestures/libqtsensorgestures_plugin.la qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.la -qt5/plugins/sensors/libqtsensors_dummy.la qt5/plugins/sensors/libqtsensors_generic.la qt5/qml/QtSensors/libdeclarative_sensors.la qt5/qml/QtSensors/plugins.qmltypes diff --git a/x11/qt5-qtsensors/buildlink3.mk b/x11/qt5-qtsensors/buildlink3.mk index 09a6bbcf740..760ce390222 100644 --- a/x11/qt5-qtsensors/buildlink3.mk +++ b/x11/qt5-qtsensors/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtsensors .if !defined(QT5_QTSENSORS_BUILDLINK3_MK) QT5_QTSENSORS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtsensors+= qt5-qtsensors>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtsensors?= ../../x11/qt5-qtsensors BUILDLINK_INCDIRS.qt5-qtsensors+= qt5/include diff --git a/x11/qt5-qtsensors/distinfo b/x11/qt5-qtsensors/distinfo index e107a25caac..02632c11cda 100644 --- a/x11/qt5-qtsensors/distinfo +++ b/x11/qt5-qtsensors/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtsensors-opensource-src-5.4.0.tar.xz) = 5fe798541707acfe7a4955076a0d27d8d58f4d15 -RMD160 (qtsensors-opensource-src-5.4.0.tar.xz) = a4b560e49f129311487ba41307c3451cb627edf6 -Size (qtsensors-opensource-src-5.4.0.tar.xz) = 2068848 bytes +SHA1 (qtsensors-opensource-src-5.5.1.tar.xz) = 12ea8c4df0bab03f2d8ef079ccfc04367c8ac94d +RMD160 (qtsensors-opensource-src-5.5.1.tar.xz) = 9a3eaad761efaefc0a56258c0bd64e01d0889cba +SHA512 (qtsensors-opensource-src-5.5.1.tar.xz) = a73cc4aa954e494cf27a17fdd9017b8c4386ab1b0bd2a259176db7a4b4fa1b3c5a3ec11ac65277bab16bff3bd751a7109098fa372965b3b935e165967c1c2049 +Size (qtsensors-opensource-src-5.5.1.tar.xz) = 1989556 bytes diff --git a/x11/qt5-qtserialport/Makefile b/x11/qt5-qtserialport/Makefile index cea5c5baf05..fcf5143c8f2 100644 --- a/x11/qt5-qtserialport/Makefile +++ b/x11/qt5-qtserialport/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtserialport-opensource-src-${QTVERSION} PKGNAME= qt5-qtserialport-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for Serial Port BUILD_TARGET= sub-src diff --git a/x11/qt5-qtserialport/PLIST b/x11/qt5-qtserialport/PLIST index 72c3fbf0e7a..8d141dc34af 100644 --- a/x11/qt5-qtserialport/PLIST +++ b/x11/qt5-qtserialport/PLIST @@ -1,29 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5SerialPort.pc -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qcore_mac_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qcore_unix_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qlockfile_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qringbuffer_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_symbian_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_unix_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_win_p.h -qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialport_wince_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qserialportinfo_p.h qt5/include/QtSerialPort/${PKGVERSION}/QtSerialPort/private/qtudev_p.h -qt5/include/QtSerialPort/QLockFile qt5/include/QtSerialPort/QSerialPort qt5/include/QtSerialPort/QSerialPortInfo -qt5/include/QtSerialPort/QWinEventNotifier qt5/include/QtSerialPort/QtSerialPort qt5/include/QtSerialPort/QtSerialPortDepends qt5/include/QtSerialPort/QtSerialPortVersion -qt5/include/QtSerialPort/qlockfile.h qt5/include/QtSerialPort/qserialport.h qt5/include/QtSerialPort/qserialportglobal.h qt5/include/QtSerialPort/qserialportinfo.h qt5/include/QtSerialPort/qtserialportversion.h -qt5/include/QtSerialPort/qwineventnotifier.h qt5/lib/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake qt5/lib/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake qt5/lib/libQt5SerialPort.la diff --git a/x11/qt5-qtserialport/buildlink3.mk b/x11/qt5-qtserialport/buildlink3.mk index bd738db2124..e9402d81445 100644 --- a/x11/qt5-qtserialport/buildlink3.mk +++ b/x11/qt5-qtserialport/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtserialport .if !defined(QT5_QTSERIALPORT_BUILDLINK3_MK) QT5_QTSERIALPORT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include diff --git a/x11/qt5-qtserialport/distinfo b/x11/qt5-qtserialport/distinfo index d751a5e0414..e7f5abc79e4 100644 --- a/x11/qt5-qtserialport/distinfo +++ b/x11/qt5-qtserialport/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtserialport-opensource-src-5.4.0.tar.xz) = ccfc39045d803405ec36bcfdbf281417dd96663a -RMD160 (qtserialport-opensource-src-5.4.0.tar.xz) = 8a6b3a5f9caf5e2bcc988ccb4e44370d6ae553ec -Size (qtserialport-opensource-src-5.4.0.tar.xz) = 251680 bytes +SHA1 (qtserialport-opensource-src-5.5.1.tar.xz) = 0b8d935f95bbd071c914d1f8a99cdbdcadca2dc8 +RMD160 (qtserialport-opensource-src-5.5.1.tar.xz) = 00c53b307fd6ad509aedc6ed0b3a464ac3d8e809 +SHA512 (qtserialport-opensource-src-5.5.1.tar.xz) = 10e24f24e013ee7a28743a39cf25c6882eff2c9f5f8b707221fd0cdb3f54b17977a4b5b98402deb043623b01786c46bd59962545e085eb121ead06568d0ed16a +Size (qtserialport-opensource-src-5.5.1.tar.xz) = 260984 bytes diff --git a/x11/qt5-qtsvg/Makefile b/x11/qt5-qtsvg/Makefile index 99f32ac1f35..793f3457904 100644 --- a/x11/qt5-qtsvg/Makefile +++ b/x11/qt5-qtsvg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:00 adam Exp $ DISTNAME= qtsvg-opensource-src-${QTVERSION} PKGNAME= qt5-qtsvg-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for SVG BUILD_TARGET= sub-src diff --git a/x11/qt5-qtsvg/buildlink3.mk b/x11/qt5-qtsvg/buildlink3.mk index a20b0160dc1..64e3d8d1ff6 100644 --- a/x11/qt5-qtsvg/buildlink3.mk +++ b/x11/qt5-qtsvg/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qtsvg .if !defined(QT5_QTSVG_BUILDLINK3_MK) QT5_QTSVG_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include diff --git a/x11/qt5-qtsvg/distinfo b/x11/qt5-qtsvg/distinfo index 9ef32424e59..3d30c938c41 100644 --- a/x11/qt5-qtsvg/distinfo +++ b/x11/qt5-qtsvg/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qtsvg-opensource-src-5.4.0.tar.xz) = b49d9974dd83c82887a076f9093250cb9fcceea7 -RMD160 (qtsvg-opensource-src-5.4.0.tar.xz) = 876cc98f57301ae7cf54d4f26bb82f8e23398841 -Size (qtsvg-opensource-src-5.4.0.tar.xz) = 1758668 bytes +SHA1 (qtsvg-opensource-src-5.5.1.tar.xz) = 701fcc10201abcf540d26a8fcc6a8b7184dc16b1 +RMD160 (qtsvg-opensource-src-5.5.1.tar.xz) = db1dd37355a1e4b40a37decc1df60d574ab14088 +SHA512 (qtsvg-opensource-src-5.5.1.tar.xz) = 68b53c5564618922b9df8f4600a4f90a2d3bb4e985b1edec7f4934505399555c0de89b724b1b97ac19bf1119e72e1a06569d5ae7f73ce5c1cad93a66ac0b5a83 +Size (qtsvg-opensource-src-5.5.1.tar.xz) = 1802880 bytes diff --git a/x11/qt5-qttools/Makefile b/x11/qt5-qttools/Makefile index 8cb3f9e57a0..285967e51c9 100644 --- a/x11/qt5-qttools/Makefile +++ b/x11/qt5-qttools/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/26 19:04:00 adam Exp $ DISTNAME= qttools-opensource-src-${QTVERSION} PKGNAME= qt5-qttools-${QTVERSION} -PKGREVISION= 5 COMMENT= Qt5 tools DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils @@ -23,7 +22,6 @@ post-install: ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} .endfor -.include "../../x11/qt5-dbus/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" .include "../../x11/qt5-sqlite3/buildlink3.mk" diff --git a/x11/qt5-qttools/PLIST b/x11/qt5-qttools/PLIST index 99c7eb9a28b..ca3356bd23a 100644 --- a/x11/qt5-qttools/PLIST +++ b/x11/qt5-qttools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/10/26 19:04:00 adam Exp $ lib/pkgconfig/Qt5CLucene.pc lib/pkgconfig/Qt5Designer.pc lib/pkgconfig/Qt5DesignerComponents.pc @@ -23,6 +23,7 @@ qt5/bin/qhelpconverter qt5/bin/qhelpgenerator qt5/bin/qtdiag qt5/bin/qtpaths +qt5/bin/qtplugininfo qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qanalyzer_p.h qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qclucene-config_p.h qt5/include/QtCLucene/${PKGVERSION}/QtCLucene/private/qclucene_global_p.h @@ -258,6 +259,15 @@ qt5/include/QtHelp/qhelpsearchengine.h qt5/include/QtHelp/qhelpsearchquerywidget.h qt5/include/QtHelp/qhelpsearchresultwidget.h qt5/include/QtHelp/qthelpversion.h +qt5/include/QtUiPlugin/QDesignerCustomWidgetCollectionInterface +qt5/include/QtUiPlugin/QDesignerCustomWidgetInterface +qt5/include/QtUiPlugin/QDesignerExportWidget +qt5/include/QtUiPlugin/QtUiPlugin +qt5/include/QtUiPlugin/QtUiPluginDepends +qt5/include/QtUiPlugin/QtUiPluginVersion +qt5/include/QtUiPlugin/customwidget.h +qt5/include/QtUiPlugin/qdesignerexportwidget.h +qt5/include/QtUiPlugin/qtuipluginversion.h qt5/include/QtUiTools/${PKGVERSION}/QtUiTools/private/quiloader_p.h qt5/include/QtUiTools/QUiLoader qt5/include/QtUiTools/QtUiTools @@ -275,6 +285,8 @@ qt5/lib/cmake/Qt5Help/Qt5HelpConfigVersion.cmake qt5/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake qt5/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake qt5/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake +qt5/lib/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake +qt5/lib/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake qt5/lib/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake qt5/lib/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake qt5/lib/libQt5CLucene.la @@ -298,6 +310,7 @@ qt5/mkspecs/modules/qt_lib_designer_private.pri qt5/mkspecs/modules/qt_lib_designercomponents_private.pri qt5/mkspecs/modules/qt_lib_help.pri qt5/mkspecs/modules/qt_lib_help_private.pri +qt5/mkspecs/modules/qt_lib_uiplugin.pri qt5/mkspecs/modules/qt_lib_uitools.pri qt5/mkspecs/modules/qt_lib_uitools_private.pri qt5/phrasebooks/danish.qph diff --git a/x11/qt5-qttools/buildlink3.mk b/x11/qt5-qttools/buildlink3.mk index 481e8bb4288..434878b3a2f 100644 --- a/x11/qt5-qttools/buildlink3.mk +++ b/x11/qt5-qttools/buildlink3.mk @@ -1,19 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.14 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2015/10/26 19:04:00 adam Exp $ BUILDLINK_TREE+= qt5-qttools .if !defined(QT5_QTTOOLS_BUILDLINK3_MK) QT5_QTTOOLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qttools+= qt5-qttools>=5.4.0nb4 +BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qttools+= qt5-qttools>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qttools?= ../../x11/qt5-qttools BUILDLINK_INCDIRS.qt5-qttools+= qt5/include BUILDLINK_LIBDIRS.qt5-qttools+= qt5/lib BUILDLINK_LIBDIRS.qt5-qttools+= qt5/plugins -.include "../../x11/qt5-dbus/buildlink3.mk" .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" .include "../../x11/qt5-qtwebkit/buildlink3.mk" .include "../../x11/qt5-sqlite3/buildlink3.mk" diff --git a/x11/qt5-qttools/distinfo b/x11/qt5-qttools/distinfo index 7c2f12af112..942bf1993f7 100644 --- a/x11/qt5-qttools/distinfo +++ b/x11/qt5-qttools/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:00 adam Exp $ -SHA1 (qttools-opensource-src-5.4.0.tar.xz) = e923f9f7b2696bc7f451325599d55739dd5aa88a -RMD160 (qttools-opensource-src-5.4.0.tar.xz) = 8b0e1da7e8f9215c04b68b58fdded0d4553ff11d -Size (qttools-opensource-src-5.4.0.tar.xz) = 9261924 bytes +SHA1 (qttools-opensource-src-5.5.1.tar.xz) = f7815165d0b427346028901a42be5f0f47d05962 +RMD160 (qttools-opensource-src-5.5.1.tar.xz) = 279aacc94f7fa583a59d3fe005ecb3e598e92b32 +SHA512 (qttools-opensource-src-5.5.1.tar.xz) = b5049cb48aa051c5d049821c55e62788bc7928acef1c668c142f317072d904bbd9571944665bd727d13b3c516a1361e909f99c87717ffc6eb6210e443e821b1b +Size (qttools-opensource-src-5.5.1.tar.xz) = 9327100 bytes SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8161e4a61815b047f9c8b7c7a5578170db3a5eb7 SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = dc741575811ee3f65d51c971c9907bd5eda3993a SHA1 (patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = b0b5c5c5c8fbd26fbf89899e4b32e35ccf946f83 SHA1 (patch-src_assistant_clucene_qclucene-config__p.h) = 9c093ca76ae4eef6ba5622d4f2916d42813f4f1a -SHA1 (patch-src_designer_src_uitools_uitools.pro) = 17e6c0f3904ef83d2a46fb03a04556d306268075 +SHA1 (patch-src_designer_src_uitools_uitools.pro) = f4879d5a8ac5c0fdc316656a2bd05f2dbb726231 diff --git a/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro b/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro index fe6f5013af9..4555da61103 100644 --- a/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro +++ b/x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro @@ -1,13 +1,13 @@ -$NetBSD: patch-src_designer_src_uitools_uitools.pro,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: patch-src_designer_src_uitools_uitools.pro,v 1.2 2015/10/26 19:04:00 adam Exp $ * Libtoolized and build as shared library ---- src/designer/src/uitools/uitools.pro.orig 2013-11-27 01:01:52.000000000 +0000 +--- src/designer/src/uitools/uitools.pro.orig 2015-10-13 04:38:12.000000000 +0000 +++ src/designer/src/uitools/uitools.pro @@ -1,5 +1,5 @@ TARGET = QtUiTools -CONFIG += static -+CONFIG += - QT = core ++CONFIG += + + include(../lib/uilib/uilib.pri) - QMAKE_DOCS = $$PWD/doc/qtuitools.qdocconf diff --git a/x11/qt5-qttranslations/Makefile b/x11/qt5-qttranslations/Makefile index e0ff459f344..77549e31546 100644 --- a/x11/qt5-qttranslations/Makefile +++ b/x11/qt5-qttranslations/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2015/10/10 01:58:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2015/10/26 19:04:01 adam Exp $ DISTNAME= qttranslations-opensource-src-${QTVERSION} PKGNAME= qt5-qttranslations-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 translations MAKE_ENV+= QTDIR=${QTDIR} diff --git a/x11/qt5-qttranslations/PLIST b/x11/qt5-qttranslations/PLIST index 0c8b7b4f39f..be783a6ce91 100644 --- a/x11/qt5-qttranslations/PLIST +++ b/x11/qt5-qttranslations/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2014/12/30 17:23:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:01 adam Exp $ qt5/translations/assistant_cs.qm qt5/translations/assistant_da.qm qt5/translations/assistant_de.qm +qt5/translations/assistant_en.qm qt5/translations/assistant_fr.qm qt5/translations/assistant_hu.qm qt5/translations/assistant_ja.qm @@ -15,6 +16,7 @@ qt5/translations/assistant_zh_CN.qm qt5/translations/assistant_zh_TW.qm qt5/translations/designer_cs.qm qt5/translations/designer_de.qm +qt5/translations/designer_en.qm qt5/translations/designer_fr.qm qt5/translations/designer_hu.qm qt5/translations/designer_ja.qm @@ -28,6 +30,7 @@ qt5/translations/designer_zh_CN.qm qt5/translations/designer_zh_TW.qm qt5/translations/linguist_cs.qm qt5/translations/linguist_de.qm +qt5/translations/linguist_en.qm qt5/translations/linguist_fr.qm qt5/translations/linguist_hu.qm qt5/translations/linguist_ja.qm @@ -40,9 +43,12 @@ qt5/translations/linguist_uk.qm qt5/translations/linguist_zh_CN.qm qt5/translations/linguist_zh_TW.qm qt5/translations/qmlviewer_cs.qm +qt5/translations/qmlviewer_en.qm qt5/translations/qmlviewer_fi.qm +qt5/translations/qmlviewer_fr.qm qt5/translations/qmlviewer_hu.qm qt5/translations/qmlviewer_ja.qm +qt5/translations/qmlviewer_ko.qm qt5/translations/qmlviewer_ru.qm qt5/translations/qmlviewer_sk.qm qt5/translations/qmlviewer_uk.qm @@ -51,6 +57,7 @@ qt5/translations/qt_ca.qm qt5/translations/qt_cs.qm qt5/translations/qt_da.qm qt5/translations/qt_de.qm +qt5/translations/qt_en.qm qt5/translations/qt_es.qm qt5/translations/qt_fa.qm qt5/translations/qt_fi.qm @@ -60,6 +67,7 @@ qt5/translations/qt_he.qm qt5/translations/qt_help_cs.qm qt5/translations/qt_help_da.qm qt5/translations/qt_help_de.qm +qt5/translations/qt_help_en.qm qt5/translations/qt_help_fr.qm qt5/translations/qt_help_gl.qm qt5/translations/qt_help_hu.qm @@ -90,10 +98,14 @@ qt5/translations/qt_zh_TW.qm qt5/translations/qtbase_ca.qm qt5/translations/qtbase_cs.qm qt5/translations/qtbase_de.qm +qt5/translations/qtbase_en.qm qt5/translations/qtbase_fi.qm +qt5/translations/qtbase_fr.qm +qt5/translations/qtbase_he.qm qt5/translations/qtbase_hu.qm qt5/translations/qtbase_it.qm qt5/translations/qtbase_ja.qm +qt5/translations/qtbase_ko.qm qt5/translations/qtbase_lv.qm qt5/translations/qtbase_ru.qm qt5/translations/qtbase_sk.qm @@ -109,57 +121,84 @@ qt5/translations/qtconfig_uk.qm qt5/translations/qtconfig_zh_CN.qm qt5/translations/qtconfig_zh_TW.qm qt5/translations/qtconnectivity_de.qm +qt5/translations/qtconnectivity_en.qm +qt5/translations/qtconnectivity_ko.qm qt5/translations/qtconnectivity_uk.qm qt5/translations/qtdeclarative_de.qm +qt5/translations/qtdeclarative_en.qm qt5/translations/qtdeclarative_fi.qm +qt5/translations/qtdeclarative_fr.qm qt5/translations/qtdeclarative_ja.qm +qt5/translations/qtdeclarative_ko.qm qt5/translations/qtdeclarative_lv.qm qt5/translations/qtdeclarative_ru.qm qt5/translations/qtdeclarative_sk.qm qt5/translations/qtdeclarative_uk.qm qt5/translations/qtlocation_de.qm +qt5/translations/qtlocation_en.qm +qt5/translations/qtlocation_fr.qm +qt5/translations/qtlocation_ko.qm qt5/translations/qtlocation_uk.qm qt5/translations/qtmultimedia_ca.qm qt5/translations/qtmultimedia_cs.qm qt5/translations/qtmultimedia_de.qm +qt5/translations/qtmultimedia_en.qm qt5/translations/qtmultimedia_fi.qm +qt5/translations/qtmultimedia_fr.qm qt5/translations/qtmultimedia_hu.qm qt5/translations/qtmultimedia_it.qm qt5/translations/qtmultimedia_ja.qm +qt5/translations/qtmultimedia_ko.qm qt5/translations/qtmultimedia_ru.qm qt5/translations/qtmultimedia_sk.qm qt5/translations/qtmultimedia_uk.qm qt5/translations/qtquick1_ca.qm qt5/translations/qtquick1_cs.qm qt5/translations/qtquick1_de.qm +qt5/translations/qtquick1_en.qm qt5/translations/qtquick1_fi.qm +qt5/translations/qtquick1_fr.qm +qt5/translations/qtquick1_he.qm qt5/translations/qtquick1_hu.qm qt5/translations/qtquick1_it.qm qt5/translations/qtquick1_ja.qm +qt5/translations/qtquick1_ko.qm qt5/translations/qtquick1_ru.qm qt5/translations/qtquick1_sk.qm qt5/translations/qtquick1_uk.qm qt5/translations/qtquickcontrols_de.qm +qt5/translations/qtquickcontrols_en.qm +qt5/translations/qtquickcontrols_fi.qm +qt5/translations/qtquickcontrols_fr.qm qt5/translations/qtquickcontrols_ja.qm qt5/translations/qtquickcontrols_ru.qm qt5/translations/qtquickcontrols_uk.qm qt5/translations/qtscript_ca.qm qt5/translations/qtscript_cs.qm qt5/translations/qtscript_de.qm +qt5/translations/qtscript_en.qm qt5/translations/qtscript_fi.qm +qt5/translations/qtscript_fr.qm +qt5/translations/qtscript_he.qm qt5/translations/qtscript_hu.qm qt5/translations/qtscript_it.qm qt5/translations/qtscript_ja.qm +qt5/translations/qtscript_ko.qm qt5/translations/qtscript_lv.qm qt5/translations/qtscript_ru.qm qt5/translations/qtscript_sk.qm qt5/translations/qtscript_uk.qm +qt5/translations/qtwebsockets_en.qm +qt5/translations/qtwebsockets_fr.qm qt5/translations/qtxmlpatterns_ca.qm qt5/translations/qtxmlpatterns_cs.qm qt5/translations/qtxmlpatterns_de.qm +qt5/translations/qtxmlpatterns_en.qm +qt5/translations/qtxmlpatterns_fr.qm qt5/translations/qtxmlpatterns_hu.qm qt5/translations/qtxmlpatterns_it.qm qt5/translations/qtxmlpatterns_ja.qm +qt5/translations/qtxmlpatterns_ko.qm qt5/translations/qtxmlpatterns_ru.qm qt5/translations/qtxmlpatterns_sk.qm qt5/translations/qtxmlpatterns_uk.qm diff --git a/x11/qt5-qttranslations/distinfo b/x11/qt5-qttranslations/distinfo index b3ec22cd5be..2c1f0d95852 100644 --- a/x11/qt5-qttranslations/distinfo +++ b/x11/qt5-qttranslations/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qttranslations-opensource-src-5.4.0.tar.xz) = 7649c41015efd4d111b16866aaacb5ee475e0137 -RMD160 (qttranslations-opensource-src-5.4.0.tar.xz) = 2cc838ab70430c81a75802d1dd3953a288327d67 -Size (qttranslations-opensource-src-5.4.0.tar.xz) = 1095484 bytes +SHA1 (qttranslations-opensource-src-5.5.1.tar.xz) = 0385274c9f77217f2cefbb11a56ce49e385854b3 +RMD160 (qttranslations-opensource-src-5.5.1.tar.xz) = f9c956935768cea5c935a10493963f7e411dc255 +SHA512 (qttranslations-opensource-src-5.5.1.tar.xz) = 026ee89aadd8acac609fb7e7813f8a1e9cad06912fb3e7b73ec28662b37cd353515f5d66c6ed1839d7c18006b41c88c315ac9a9001eb08637242a73753349be7 +Size (qttranslations-opensource-src-5.5.1.tar.xz) = 1153132 bytes diff --git a/x11/qt5-qtwebchannel/Makefile b/x11/qt5-qtwebchannel/Makefile index d24de7b4d70..408c7f75661 100644 --- a/x11/qt5-qtwebchannel/Makefile +++ b/x11/qt5-qtwebchannel/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtwebchannel-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebchannel-${QTVERSION} -PKGREVISION= 4 COMMENT= Qt5 WebChannel module MAKE_ENV+= QTDIR=${QTDIR} diff --git a/x11/qt5-qtwebchannel/buildlink3.mk b/x11/qt5-qtwebchannel/buildlink3.mk index 8b0f75d7976..35e499dcfa6 100644 --- a/x11/qt5-qtwebchannel/buildlink3.mk +++ b/x11/qt5-qtwebchannel/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-qtwebchannel .if !defined(QT5_QTWEBCHANNEL_BUILDLINK3_MK) QT5_QTWEBCHANNEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.4.0nb3 +BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel BUILDLINK_INCDIRS.qt5-qtwebchannel+= qt5/include diff --git a/x11/qt5-qtwebchannel/distinfo b/x11/qt5-qtwebchannel/distinfo index 69f515ada43..6bca20f4c50 100644 --- a/x11/qt5-qtwebchannel/distinfo +++ b/x11/qt5-qtwebchannel/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/02/07 13:18:14 wiz Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtwebchannel-opensource-src-5.4.0.tar.xz) = bd278ea77f689c3bf4bc1462cbcf0302004cf040 -RMD160 (qtwebchannel-opensource-src-5.4.0.tar.xz) = 987463edefc9a473843872f3c5e8917bc8c71805 -Size (qtwebchannel-opensource-src-5.4.0.tar.xz) = 83992 bytes +SHA1 (qtwebchannel-opensource-src-5.5.1.tar.xz) = 37f2cdf7d289b2d48d3f35d4181908acd8f353eb +RMD160 (qtwebchannel-opensource-src-5.5.1.tar.xz) = fca861f785f9d718aa17853bf7a3c072efcd53b7 +SHA512 (qtwebchannel-opensource-src-5.5.1.tar.xz) = 018b36b150adb18ac681e76cf52c120e1873c10ac937a311397025e556b74800db3b7d472d2373ddeaa2f9527beeac5c1ca6f57a808aa3f5c19a558cdb2ac699 +Size (qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684 bytes diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index 40ea84c3a90..b88498170fa 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.29 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtwebkit-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebkit-${QTVERSION} -PKGREVISION= 5 COMMENT= Qt5 WebView module BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk index 0f816abc25f..27fde0c1207 100644 --- a/x11/qt5-qtwebkit/buildlink3.mk +++ b/x11/qt5-qtwebkit/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-qtwebkit .if !defined(QT5_QTWEBKIT_BUILDLINK3_MK) QT5_QTWEBKIT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.4.0nb4 +BUILDLINK_API_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtwebkit+= qt5-qtwebkit>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtwebkit?= ../../x11/qt5-qtwebkit BUILDLINK_INCDIRS.qt5-qtwebkit+= qt5/include diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo index e84a4a31775..03af831a005 100644 --- a/x11/qt5-qtwebkit/distinfo +++ b/x11/qt5-qtwebkit/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.4 2015/08/30 09:56:45 markd Exp $ +$NetBSD: distinfo,v 1.5 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtwebkit-opensource-src-5.4.0.tar.xz) = e5e92e126bb673dadc329bc726c21bf4f994d829 -RMD160 (qtwebkit-opensource-src-5.4.0.tar.xz) = 7310e566174839214a962f1d2ff07cbb7decb7a2 -Size (qtwebkit-opensource-src-5.4.0.tar.xz) = 33456404 bytes +SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7 +RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9 +SHA512 (qtwebkit-opensource-src-5.5.1.tar.xz) = a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a +Size (qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924 bytes SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229 SHA1 (patch-Source_JavaScriptCore_DerivedSources.pri) = b7a81c85257ddebd7bdff546a6d6720c9a2c5b56 SHA1 (patch-Source_JavaScriptCore_JavaScriptCore.pri) = ccf64d0df1c61ff5c31c000636f3b64460562314 @@ -11,7 +12,6 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37 -SHA1 (patch-Source_JavaScriptCore_runtime_JSObject.cpp) = f08f344bb88ccf9b2383d6d7b9f7fcd07b667a39 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 3b73e876e89e920267a6bd19dba696298f00c704 SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288 SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c @@ -33,7 +33,6 @@ SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 0112 SHA1 (patch-Source_WebCore_editing_Editor.h) = 8b566568d843c9699789e9d45a019e7f4192699a SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = f596432d46cb67b5b233bf7fdf0286d94c554e5e SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = dd409929936955ad31b8ec0902067e2f23c054a2 -SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp) = 1527bd277a547d7aa4791b1e0f51be74bc8b6f20 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf SHA1 (patch-Source_WebCore_platform_graphics_surfaces_mac_GraphicsSurfaceMac.cpp) = a42d4604c92ec43d11966f2a599125d6a1e9febc diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_JSObject.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_JSObject.cpp deleted file mode 100644 index d651df99264..00000000000 --- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_runtime_JSObject.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-Source_JavaScriptCore_runtime_JSObject.cpp,v 1.1 2015/08/30 09:56:45 markd Exp $ - -Fix g++ 5.0 build - -A non-inline template needs to be explicitly instantiated if used -outside the object where it is declared. -QTBUG-44829 ---- Source/JavaScriptCore/runtime/JSObject.cpp.orig 2014-12-05 16:24:54.000000000 +0000 -+++ Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLen - } - } - -+// Used in JSArray.cpp so we must instantiate explicit -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp deleted file mode 100644 index 8fc5f6e6ce1..00000000000 --- a/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp +++ /dev/null @@ -1,223 +0,0 @@ -$NetBSD: patch-Source_WebCore_platform_graphics_gstreamer_WebKitWebSourceGStreamer.cpp,v 1.1 2015/06/12 07:57:11 wiz Exp $ - -GMutexLocker was added to glib in 2.44. Make sure we use the version from -WebCore. - ---- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2014-12-05 16:24:49.000000000 +0000 -+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObj - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObj - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitW - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKit - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrc - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithPar - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithPar - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIH - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(G - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMain - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAp - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMa - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(Gst - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(W - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(G - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(G - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer( - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ void StreamingClient::handleResponseRece - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinish - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasB - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cann - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - diff --git a/x11/qt5-qtwebsockets/Makefile b/x11/qt5-qtwebsockets/Makefile index 46ded85756c..eb03bc64772 100644 --- a/x11/qt5-qtwebsockets/Makefile +++ b/x11/qt5-qtwebsockets/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.5 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtwebsockets-opensource-src-${QTVERSION} PKGNAME= qt5-websockets-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for websockets MAKE_ENV+= QTDIR=${QTDIR} diff --git a/x11/qt5-qtwebsockets/PLIST b/x11/qt5-qtwebsockets/PLIST index fd43aab71fe..8c4356cf4ee 100644 --- a/x11/qt5-qtwebsockets/PLIST +++ b/x11/qt5-qtwebsockets/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/02/08 09:07:27 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/10/26 19:04:01 adam Exp $ lib/pkgconfig/Qt5Websockets.pc qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qdefaultmaskgenerator_p.h qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qsslserver_p.h @@ -31,6 +31,7 @@ qt5/lib/libQt5WebSockets.prl qt5/lib/pkgconfig/Qt5WebSockets.pc qt5/mkspecs/modules/qt_lib_websockets.pri qt5/mkspecs/modules/qt_lib_websockets_private.pri -qt5/qml/Qt/WebSockets/libdeclarative_qmlwebsockets.la -qt5/qml/Qt/WebSockets/plugins.qmltypes qt5/qml/Qt/WebSockets/qmldir +qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.la +qt5/qml/QtWebSockets/plugins.qmltypes +qt5/qml/QtWebSockets/qmldir diff --git a/x11/qt5-qtwebsockets/buildlink3.mk b/x11/qt5-qtwebsockets/buildlink3.mk index 3b414dcaba7..f6af03e93b0 100644 --- a/x11/qt5-qtwebsockets/buildlink3.mk +++ b/x11/qt5-qtwebsockets/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-websockets .if !defined(QT5_WEBSOCKETS_BUILDLINK3_MK) QT5_WEBSOCKETS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-websockets+= qt5-websockets>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-websockets?= qt5-websockets>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-websockets+= qt5-websockets>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-websockets+= qt5-websockets>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-websockets?= ../../x11/qt5-qtwebsockets .include "../../x11/qt5-qtdeclarative/buildlink3.mk" diff --git a/x11/qt5-qtwebsockets/distinfo b/x11/qt5-qtwebsockets/distinfo index 00fe408590e..9a2fe657012 100644 --- a/x11/qt5-qtwebsockets/distinfo +++ b/x11/qt5-qtwebsockets/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/02/08 09:07:27 wiz Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtwebsockets-opensource-src-5.4.0.tar.xz) = d0b7e62bbdd634de01d5321f94a4bdff8b228cf5 -RMD160 (qtwebsockets-opensource-src-5.4.0.tar.xz) = 88e9b93b9ef90e3b221a10aa378092ae07a8858d -Size (qtwebsockets-opensource-src-5.4.0.tar.xz) = 74660 bytes +SHA1 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 76f40fa6b8c075651c3abe2293a33fdc70f8944b +RMD160 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 83dcc5d07dca6c1cccfaed13cd16fde940ad0b94 +SHA512 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 1172269ed99eb0ef73935bb7adfb353cf7ea17240d1370cefbdb648f84151d79d8e3738258444eef15356ef733beae4912507835edbb34028d0960406dc6257f +Size (qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440 bytes diff --git a/x11/qt5-qtx11extras/Makefile b/x11/qt5-qtx11extras/Makefile index 8f7604d8132..b845cce693e 100644 --- a/x11/qt5-qtx11extras/Makefile +++ b/x11/qt5-qtx11extras/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtx11extras-opensource-src-${QTVERSION} PKGNAME= qt5-qtx11extras-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for X11 extras BUILD_TARGET= sub-src diff --git a/x11/qt5-qtx11extras/buildlink3.mk b/x11/qt5-qtx11extras/buildlink3.mk index f18e115dc25..c4f534c39e9 100644 --- a/x11/qt5-qtx11extras/buildlink3.mk +++ b/x11/qt5-qtx11extras/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-qtx11extras .if !defined(QT5_QTX11EXTRAS_BUILDLINK3_MK) QT5_QTX11EXTRAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtx11extras+= qt5-qtx11extras>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtx11extras?= ../../x11/qt5-qtx11extras BUILDLINK_INCDIRS.qt5-qtx11extras+= qt5/include diff --git a/x11/qt5-qtx11extras/distinfo b/x11/qt5-qtx11extras/distinfo index 5ee0b1bef58..ea8b9639201 100644 --- a/x11/qt5-qtx11extras/distinfo +++ b/x11/qt5-qtx11extras/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtx11extras-opensource-src-5.4.0.tar.xz) = 999026cf8389c66af22ffb29767b87b1a793595b -RMD160 (qtx11extras-opensource-src-5.4.0.tar.xz) = c764f7862df3bc2400e340c4cc205f251cd28b18 -Size (qtx11extras-opensource-src-5.4.0.tar.xz) = 25456 bytes +SHA1 (qtx11extras-opensource-src-5.5.1.tar.xz) = 1b200045600ddd93aaf8eb489d7bdc09a172b8fe +RMD160 (qtx11extras-opensource-src-5.5.1.tar.xz) = d14ee6fbaa96eb59bd7ce4319371230ddc65f39a +SHA512 (qtx11extras-opensource-src-5.5.1.tar.xz) = 5c89324cc0335c97d8028894d3a190cabfde3a132403a9983a10f32d557d146de65cd534b9cf1a7fe85251e5f0f91e009072f8f02d9b03f58318543993cf7a14 +Size (qtx11extras-opensource-src-5.5.1.tar.xz) = 33416 bytes diff --git a/x11/qt5-qtxmlpatterns/Makefile b/x11/qt5-qtxmlpatterns/Makefile index d79c4e1eab8..b45470a547b 100644 --- a/x11/qt5-qtxmlpatterns/Makefile +++ b/x11/qt5-qtxmlpatterns/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/10/10 01:57:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.12 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtxmlpatterns-opensource-src-${QTVERSION} PKGNAME= qt5-qtxmlpatterns-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 module for XML Patterns #NO_CONFIGURE= yes diff --git a/x11/qt5-qtxmlpatterns/PLIST b/x11/qt5-qtxmlpatterns/PLIST index 9f6571a1fab..1c2f05f56db 100644 --- a/x11/qt5-qtxmlpatterns/PLIST +++ b/x11/qt5-qtxmlpatterns/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:45 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2015/10/26 19:04:01 adam Exp $ lib/pkgconfig/Qt5XmlPatterns.pc qt5/bin/xmlpatterns qt5/bin/xmlpatternsvalidator @@ -106,7 +106,6 @@ qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdatetimefn_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdatetimefns_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdatetimefns_tpl_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdaytimeduration_p.h -qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdebug_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdecimal_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdeduplicateiterator_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qdeepequalfn_p.h @@ -279,6 +278,7 @@ qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtocodepointsitera qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtokenizer_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtokenrevealer_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtokensource_p.h +qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtokenvalue_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtracefn_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtreatas_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qtriplecontainer_p.h @@ -307,6 +307,7 @@ qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qvariabledeclarati qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qvariableloader_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qvariablereference_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qwithparam_p.h +qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qxmldebug_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qxmlpatternistcli_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qxmlquery_p.h qt5/include/QtXmlPatterns/${PKGVERSION}/QtXmlPatterns/private/qxmlresultitems_p.h diff --git a/x11/qt5-qtxmlpatterns/buildlink3.mk b/x11/qt5-qtxmlpatterns/buildlink3.mk index 07848af1d75..46cbec4b05d 100644 --- a/x11/qt5-qtxmlpatterns/buildlink3.mk +++ b/x11/qt5-qtxmlpatterns/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/04/25 14:25:19 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-qtxmlpatterns .if !defined(QT5_QTXMLPATTERNS_BUILDLINK3_MK) QT5_QTXMLPATTERNS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns BUILDLINK_INCDIRS.qt5-qtxmlpatterns+= qt5/include diff --git a/x11/qt5-qtxmlpatterns/distinfo b/x11/qt5-qtxmlpatterns/distinfo index 92bc1a61dcc..31d7ba075b1 100644 --- a/x11/qt5-qtxmlpatterns/distinfo +++ b/x11/qt5-qtxmlpatterns/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = e6d08bca4186b8c10e669836e5f6133ad59c9cce -RMD160 (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = e623f0828cbe60c1108337d629cbc3f3ffba415c -Size (qtxmlpatterns-opensource-src-5.4.0.tar.xz) = 1307936 bytes +SHA1 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 15d2aeaaee4840aa3b015dfc7502982a0e5685f5 +RMD160 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 403a3b2377728629b6a3f1073b24af3f3360adf7 +SHA512 (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 2d225f686e0f081f7833b3a79ca8cff85d02e49f57be59ba9daff028965d9fc8e2b0389778d7415578b540f056c86e5b9127c7f93c6af1d1828a4fe73d9bfa10 +Size (qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560 bytes diff --git a/x11/qt5-sqlite3/Makefile b/x11/qt5-sqlite3/Makefile index dde84a233cd..56e85e512e1 100644 --- a/x11/qt5-sqlite3/Makefile +++ b/x11/qt5-sqlite3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2015/10/10 01:57:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2015/10/26 19:04:01 adam Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-sqlite3-${QTVERSION} -PKGREVISION= 3 COMMENT= Qt5 SQLite3 plugin BUILD_DIRS= src/plugins/sqldrivers diff --git a/x11/qt5-sqlite3/buildlink3.mk b/x11/qt5-sqlite3/buildlink3.mk index 7fa37a8724d..ac3c791c643 100644 --- a/x11/qt5-sqlite3/buildlink3.mk +++ b/x11/qt5-sqlite3/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/04/25 14:25:19 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2015/10/26 19:04:01 adam Exp $ BUILDLINK_TREE+= qt5-sqlite3 .if !defined(QT5_SQLITE3_BUILDLINK3_MK) QT5_SQLITE3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0 -BUILDLINK_ABI_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.4.0nb2 +BUILDLINK_API_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.5.1 +BUILDLINK_ABI_DEPENDS.qt5-sqlite3+= qt5-sqlite3>=5.5.1 BUILDLINK_PKGSRCDIR.qt5-sqlite3?= ../../x11/qt5-sqlite3 BUILDLINK_LIBDIRS.qt5-sqlite3+= qt5/plugins diff --git a/x11/qt5-sqlite3/distinfo b/x11/qt5-sqlite3/distinfo index 1f88252b9f1..5c6cf3fd5fd 100644 --- a/x11/qt5-sqlite3/distinfo +++ b/x11/qt5-sqlite3/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2014/12/30 17:23:48 adam Exp $ +$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $ -SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd -RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 -Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes +SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f +RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 +SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 +Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes diff --git a/x11/qt5/Makefile b/x11/qt5/Makefile index 7907699bcc1..634abbd6a44 100644 --- a/x11/qt5/Makefile +++ b/x11/qt5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/12/30 17:23:45 adam Exp $ +# $NetBSD: Makefile,v 1.6 2015/10/26 19:03:59 adam Exp $ DISTNAME= qt5-${QTVERSION} CATEGORIES= x11 @@ -10,7 +10,6 @@ META_PACKAGE= yes .include "Makefile.common" -DEPENDS+= qt5-dbus-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-dbus DEPENDS+= qt5-mysql-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-mysql DEPENDS+= qt5-odbc-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-odbc DEPENDS+= qt5-psql-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-psql @@ -29,11 +28,11 @@ DEPENDS+= qt5-qtserialport-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtserialport DEPENDS+= qt5-qtsvg-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtsvg DEPENDS+= qt5-qttools-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttools DEPENDS+= qt5-qttranslations-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qttranslations +DEPENDS+= qt5-qtwebchannel-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebchannel DEPENDS+= qt5-qtwebkit-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebkit +DEPENDS+= qt5-qtwebsockets-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtwebsockets DEPENDS+= qt5-qtxmlpatterns-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtxmlpatterns DEPENDS+= qt5-sqlite3-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-sqlite3 -#DEPENDS+= qt5-ibus-${QTVERSION}{,nb[0-9]*}:../../inputmethod/qt5-ibus -#DEPENDS+= qt5-uim-[0-9]*:../../inputmethod/qt5-uim .if ${OPSYS} == "Darwin" DEPENDS+= qt5-qtmacextras-${QTVERSION}{,nb[0-9]*}:../../x11/qt5-qtmacextras .else diff --git a/x11/qt5/Makefile.common b/x11/qt5/Makefile.common index 16377d66f9d..54f79754077 100644 --- a/x11/qt5/Makefile.common +++ b/x11/qt5/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.4 2014/12/30 17:23:45 adam Exp $ +# $NetBSD: Makefile.common,v 1.5 2015/10/26 19:03:59 adam Exp $ # used by x11/qt5-qtbase/Makefile.common # used by inputmethod/qt5-uim/Makefile -QTVERSION= 5.4.0 +QTVERSION= 5.5.1 .include "../../mk/bsd.prefs.mk" |