Re: pkg/55910: qt5-qcbase incomplete package installation / failed build

[Aleksey Arens <aza.sea.agenda%gmail.com@localhost>]

If a gtk3 is built with -dbus option (which also implies
-gtk3-atk-bridge), then the PLIST
for this package would contain fewer files.  An examination of build specs in
CMakefile.txt files confirms that this result is natural and should
not be harmful.
Since qt5-qtbase would not build with dbus enabled if gtk3 was built
with -dbus, then it
is also natural to assume that dbus in this package is enabled if and
only if it was
enabled in gtk3.

The application of a following patch results in a successful build on
a system with global
-dbus.

---8<---



diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST
index a9320ccaef6..642330f9548 100644
--- a/x11/qt5-qtbase/PLIST
+++ b/x11/qt5-qtbase/PLIST
@@ -1695,17 +1695,17 @@ ${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupport
 ${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupportDepends
 ${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupportVersion
 ${PLIST.notdarwin}qt5/include/QtKmsSupport/qtkmssupportversion.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/application_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/bridge_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/cache_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/constant_mappings_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/dbusconnection_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion
-${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/application_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/bridge_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/cache_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/constant_mappings_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/dbusconnection_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/struct_marshallers_p.h
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupport
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportDepends
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/QtLinuxAccessibilitySupportVersion
+${PLIST.gtk3}${PLIST.dbus}qt5/include/QtLinuxAccessibilitySupport/qtlinuxaccessibilitysupportversion.h
 qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/bitstreams_p.h
 qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/hpack_p.h
 qt5/include/QtNetwork/${PKGVERSION}/QtNetwork/private/hpacktable_p.h
@@ -2751,8 +2751,8 @@
${PLIST.notdarwin}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfig.cmake
 ${PLIST.notdarwin}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
 ${PLIST.notdarwin}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
 ${PLIST.notdarwin}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
-${PLIST.gtk3}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake
-${PLIST.gtk3}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake
+${PLIST.gtk3}${PLIST.dbus}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake
+${PLIST.gtk3}${PLIST.dbus}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake
 qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake
 qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
 qt5/lib/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake
@@ -2837,8 +2837,8 @@ ${PLIST.notdarwin}qt5/lib/libQt5InputSupport.a
 ${PLIST.notdarwin}qt5/lib/libQt5InputSupport.prl
 ${PLIST.notdarwin}qt5/lib/libQt5KmsSupport.a
 ${PLIST.notdarwin}qt5/lib/libQt5KmsSupport.prl
-${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.a
-${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.prl
+${PLIST.gtk3}${PLIST.dbus}qt5/lib/libQt5LinuxAccessibilitySupport.a
+${PLIST.gtk3}${PLIST.dbus}qt5/lib/libQt5LinuxAccessibilitySupport.prl
 qt5/lib/libQt5Network.prl
 qt5/lib/libQt5Network.so
 qt5/lib/libQt5Network.so.${PKGVERSION}
@@ -3357,7 +3357,7 @@ qt5/mkspecs/modules/qt_lib_gui.pri
 qt5/mkspecs/modules/qt_lib_gui_private.pri
 ${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_input_support_private.pri
 ${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_kms_support_private.pri
-${PLIST.gtk3}qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri
+${PLIST.gtk3}${PLIST.dbus}qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri
 qt5/mkspecs/modules/qt_lib_network.pri
 qt5/mkspecs/modules/qt_lib_network_private.pri
 qt5/mkspecs/modules/qt_lib_opengl.pri
diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk
index 86b0f7c0b60..fded1ed667d 100644
--- a/x11/qt5-qtbase/buildlink3.mk
+++ b/x11/qt5-qtbase/buildlink3.mk
@@ -27,7 +27,7 @@ PTHREAD_OPTS+= require
 pkgbase := qt5-qtbase
 .include "../../mk/pkg-build-options.mk"

-.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+.if !empty(${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus})
 .include "../../sysutils/dbus/buildlink3.mk"
 .endif