diff options
Diffstat (limited to 'x11/qt5-qtbase')
26 files changed, 426 insertions, 381 deletions
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; - |