pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: allow building without dbus
details: https://anonhg.NetBSD.org/pkgsrc/rev/5e7846cb88b3
branches: trunk
changeset: 425106:5e7846cb88b3
user: tnn <tnn%pkgsrc.org@localhost>
date: Wed Mar 18 21:48:03 2020 +0000
description:
qt5-qtbase: allow building without dbus
diffstat:
x11/qt5-qtbase/Makefile | 8 +-
x11/qt5-qtbase/PLIST | 172 +++++++++++++++++++++---------------------
x11/qt5-qtbase/buildlink3.mk | 10 +-
x11/qt5-qtbase/options.mk | 17 +++-
4 files changed, 110 insertions(+), 97 deletions(-)
diffs (truncated from 351 to 300 lines):
diff -r 1f5875c4df69 -r 5e7846cb88b3 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile Wed Mar 18 21:30:56 2020 +0000
+++ b/x11/qt5-qtbase/Makefile Wed Mar 18 21:48:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2020/03/10 22:09:13 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2020/03/18 21:48:03 tnn Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtbase-${QTVERSION}
@@ -14,7 +14,6 @@
CONFIGURE_ARGS+= -opensource -confirm-license
CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
CONFIGURE_ARGS+= -accessibility
-CONFIGURE_ARGS+= -dbus-linked
CONFIGURE_ARGS+= -icu
CONFIGURE_ARGS+= -libproxy
CONFIGURE_ARGS+= -openssl-linked
@@ -156,7 +155,7 @@
BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
BROKEN_FILES1= qt5/mkspecs/qmodule.pri
-PC_FILES= Qt5Concurrent.pc Qt5Core.pc Qt5DBus.pc \
+PC_FILES= Qt5Concurrent.pc Qt5Core.pc \
Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
Qt5OpenGLExtensions.pc \
Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
@@ -233,9 +232,6 @@
.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"
.include "../../www/libproxy/buildlink3.mk"
.if ${OPSYS} != "Darwin"
diff -r 1f5875c4df69 -r 5e7846cb88b3 x11/qt5-qtbase/PLIST
--- a/x11/qt5-qtbase/PLIST Wed Mar 18 21:30:56 2020 +0000
+++ b/x11/qt5-qtbase/PLIST Wed Mar 18 21:48:03 2020 +0000
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.28 2020/01/27 18:36:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2020/03/18 21:48:03 tnn Exp $
lib/pkgconfig/Qt5Concurrent.pc
lib/pkgconfig/Qt5Core.pc
-lib/pkgconfig/Qt5DBus.pc
+${PLIST.dbus}lib/pkgconfig/Qt5DBus.pc
lib/pkgconfig/Qt5Gui.pc
lib/pkgconfig/Qt5Network.pc
lib/pkgconfig/Qt5OpenGL.pc
@@ -13,8 +13,8 @@
lib/pkgconfig/Qt5Xml.pc
qt5/bin/fixqt4headers.pl
qt5/bin/moc
-qt5/bin/qdbuscpp2xml
-qt5/bin/qdbusxml2cpp
+${PLIST.dbus}qt5/bin/qdbuscpp2xml
+${PLIST.dbus}qt5/bin/qdbusxml2cpp
qt5/bin/qlalr
qt5/bin/qmake
qt5/bin/qvkgen
@@ -896,72 +896,72 @@
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/${PKGVERSION}/QtDBus/private/qtdbusglobal_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/qtdbusglobal.h
-qt5/include/QtDBus/qtdbusversion.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/dbus_minimal_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbus_symbols_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractadaptor_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusabstractinterface_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusargument_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnection_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusconnectionmanager_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuscontext_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintegrator_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusinterface_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusintrospection_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmessage_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetaobject_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusmetatype_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbuspendingcall_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusthreaddebug_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusutil_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qdbusxmlparser_p.h
+${PLIST.dbus}qt5/include/QtDBus/${PKGVERSION}/QtDBus/private/qtdbusglobal_p.h
+${PLIST.dbus}qt5/include/QtDBus/QDBusAbstractAdaptor
+${PLIST.dbus}qt5/include/QtDBus/QDBusAbstractInterface
+${PLIST.dbus}qt5/include/QtDBus/QDBusAbstractInterfaceBase
+${PLIST.dbus}qt5/include/QtDBus/QDBusArgument
+${PLIST.dbus}qt5/include/QtDBus/QDBusConnection
+${PLIST.dbus}qt5/include/QtDBus/QDBusConnectionInterface
+${PLIST.dbus}qt5/include/QtDBus/QDBusContext
+${PLIST.dbus}qt5/include/QtDBus/QDBusError
+${PLIST.dbus}qt5/include/QtDBus/QDBusInterface
+${PLIST.dbus}qt5/include/QtDBus/QDBusMessage
+${PLIST.dbus}qt5/include/QtDBus/QDBusMetaType
+${PLIST.dbus}qt5/include/QtDBus/QDBusObjectPath
+${PLIST.dbus}qt5/include/QtDBus/QDBusPendingCall
+${PLIST.dbus}qt5/include/QtDBus/QDBusPendingCallWatcher
+${PLIST.dbus}qt5/include/QtDBus/QDBusPendingReply
+${PLIST.dbus}qt5/include/QtDBus/QDBusPendingReplyData
+${PLIST.dbus}qt5/include/QtDBus/QDBusReply
+${PLIST.dbus}qt5/include/QtDBus/QDBusServer
+${PLIST.dbus}qt5/include/QtDBus/QDBusServiceWatcher
+${PLIST.dbus}qt5/include/QtDBus/QDBusSignature
+${PLIST.dbus}qt5/include/QtDBus/QDBusUnixFileDescriptor
+${PLIST.dbus}qt5/include/QtDBus/QDBusVariant
+${PLIST.dbus}qt5/include/QtDBus/QDBusVirtualObject
+${PLIST.dbus}qt5/include/QtDBus/QtDBus
+${PLIST.dbus}qt5/include/QtDBus/QtDBusDepends
+${PLIST.dbus}qt5/include/QtDBus/QtDBusVersion
+${PLIST.dbus}qt5/include/QtDBus/qdbusabstractadaptor.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusabstractinterface.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusargument.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusconnection.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusconnectioninterface.h
+${PLIST.dbus}qt5/include/QtDBus/qdbuscontext.h
+${PLIST.dbus}qt5/include/QtDBus/qdbuserror.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusextratypes.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusinterface.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusmacros.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusmessage.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusmetatype.h
+${PLIST.dbus}qt5/include/QtDBus/qdbuspendingcall.h
+${PLIST.dbus}qt5/include/QtDBus/qdbuspendingreply.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusreply.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusserver.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusservicewatcher.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusunixfiledescriptor.h
+${PLIST.dbus}qt5/include/QtDBus/qdbusvirtualobject.h
+${PLIST.dbus}qt5/include/QtDBus/qtdbusglobal.h
+${PLIST.dbus}qt5/include/QtDBus/qtdbusversion.h
qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_dummy_p.h
qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_p.h
qt5/include/QtDeviceDiscoverySupport/${PKGVERSION}/QtDeviceDiscoverySupport/private/qdevicediscovery_static_p.h
@@ -2690,10 +2690,10 @@
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
+${PLIST.dbus}qt5/lib/cmake/Qt5DBus/Qt5DBusConfig.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5DBus/Qt5DBusMacros.cmake
qt5/lib/cmake/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfig.cmake
qt5/lib/cmake/Qt5DeviceDiscoverySupport/Qt5DeviceDiscoverySupportConfigVersion.cmake
qt5/lib/cmake/Qt5EdidSupport/Qt5EdidSupportConfig.cmake
@@ -2724,7 +2724,7 @@
qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
${PLIST.gtk3}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
+${PLIST.dbus}${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
@@ -2734,7 +2734,7 @@
${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
-qt5/lib/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
+${PLIST.dbus}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
${PLIST.unix}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfig.cmake
${PLIST.unix}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
${PLIST.unix}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
@@ -2787,11 +2787,11 @@
qt5/lib/libQt5Core.so.${PKGVERSION}
qt5/lib/libQt5Core.so.5
qt5/lib/libQt5Core.so.5.14
-qt5/lib/libQt5DBus.prl
-qt5/lib/libQt5DBus.so
-qt5/lib/libQt5DBus.so.${PKGVERSION}
-qt5/lib/libQt5DBus.so.5
-qt5/lib/libQt5DBus.so.5.14
+${PLIST.dbus}qt5/lib/libQt5DBus.prl
+${PLIST.dbus}qt5/lib/libQt5DBus.so
+${PLIST.dbus}qt5/lib/libQt5DBus.so.${PKGVERSION}
+${PLIST.dbus}qt5/lib/libQt5DBus.so.5
+${PLIST.dbus}qt5/lib/libQt5DBus.so.5.14
qt5/lib/libQt5DeviceDiscoverySupport.a
qt5/lib/libQt5DeviceDiscoverySupport.prl
qt5/lib/libQt5EdidSupport.a
@@ -2882,7 +2882,7 @@
qt5/lib/libQt5Xml.so.5.14
qt5/lib/pkgconfig/Qt5Concurrent.pc
qt5/lib/pkgconfig/Qt5Core.pc
-qt5/lib/pkgconfig/Qt5DBus.pc
+${PLIST.dbus}qt5/lib/pkgconfig/Qt5DBus.pc
qt5/lib/pkgconfig/Qt5Gui.pc
qt5/lib/pkgconfig/Qt5Network.pc
qt5/lib/pkgconfig/Qt5OpenGL.pc
@@ -3324,8 +3324,8 @@
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
+${PLIST.dbus}qt5/mkspecs/modules/qt_lib_dbus.pri
+${PLIST.dbus}qt5/mkspecs/modules/qt_lib_dbus_private.pri
qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri
qt5/mkspecs/modules/qt_lib_edid_support_private.pri
${PLIST.egl}qt5/mkspecs/modules/qt_lib_egl_support_private.pri
@@ -3455,7 +3455,7 @@
qt5/plugins/imageformats/libqico.so
qt5/plugins/imageformats/libqjpeg.so
${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
-${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+${PLIST.dbus}${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
${PLIST.egl}qt5/plugins/platforms/libqeglfs.so
qt5/plugins/platforms/libqminimal.so
${PLIST.egl}qt5/plugins/platforms/libqminimalegl.so
@@ -3463,7 +3463,7 @@
${PLIST.unix}qt5/plugins/platforms/libqvnc.so
${PLIST.unix}qt5/plugins/platforms/libqxcb.so
${PLIST.gtk3}qt5/plugins/platformthemes/libqgtk3.so
-qt5/plugins/platformthemes/libqxdgdesktopportal.so
+${PLIST.dbus}qt5/plugins/platformthemes/libqxdgdesktopportal.so
${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.so
qt5/plugins/sqldrivers/libqsqlite.so
${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
diff -r 1f5875c4df69 -r 5e7846cb88b3 x11/qt5-qtbase/buildlink3.mk
--- a/x11/qt5-qtbase/buildlink3.mk Wed Mar 18 21:30:56 2020 +0000
+++ b/x11/qt5-qtbase/buildlink3.mk Wed Mar 18 21:48:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2020/03/10 22:09:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2020/03/18 21:48:03 tnn Exp $
BUILDLINK_TREE+= qt5-qtbase
@@ -21,7 +21,12 @@
PTHREAD_OPTS+= require
Home |
Main Index |
Thread Index |
Old Index