CVS commit: pkgsrc/x11/qt5-qtbase

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul 24 19:44:55 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtbase: PLIST options.mk

Log Message:
qt5-qtbase: Fix package creation with gtk3 option.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/qt5-qtbase/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt5-qtbase/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/PLIST
diff -u pkgsrc/x11/qt5-qtbase/PLIST:1.21 pkgsrc/x11/qt5-qtbase/PLIST:1.22
--- pkgsrc/x11/qt5-qtbase/PLIST:1.21    Mon Jul  1 05:49:44 2019
+++ pkgsrc/x11/qt5-qtbase/PLIST Wed Jul 24 19:44:55 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2019/07/01 05:49:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2019/07/24 19:44:55 nia Exp $
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
 lib/pkgconfig/Qt5DBus.pc
@@ -1559,6 +1559,17 @@ ${PLIST.unix}qt5/include/QtKmsSupport/Qt
 ${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportDepends
 ${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportVersion
 ${PLIST.unix}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
 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
@@ -2544,6 +2555,7 @@ qt5/lib/cmake/Qt5DBus/Qt5DBusMacros.cmak
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
+${PLIST.gtk3}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSEmulatorIntegrationPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
@@ -2635,6 +2647,8 @@ qt5/lib/libQt5Gui.so.5
 qt5/lib/libQt5Gui.so.5.12
 ${PLIST.unix}qt5/lib/libQt5KmsSupport.a
 ${PLIST.unix}qt5/lib/libQt5KmsSupport.prl
+${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.a
+${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.prl
 qt5/lib/libQt5Network.prl
 qt5/lib/libQt5Network.so
 qt5/lib/libQt5Network.so.${PKGVERSION}
@@ -3123,6 +3137,7 @@ qt5/mkspecs/modules/qt_lib_fontdatabase_
 ${PLIST.unix}qt5/mkspecs/modules/qt_lib_glx_support_private.pri
 qt5/mkspecs/modules/qt_lib_gui.pri
 qt5/mkspecs/modules/qt_lib_gui_private.pri
+${PLIST.gtk3}qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri
 ${PLIST.unix}qt5/mkspecs/modules/qt_lib_kms_support_private.pri
 qt5/mkspecs/modules/qt_lib_network.pri
 qt5/mkspecs/modules/qt_lib_network_private.pri
@@ -3246,6 +3261,7 @@ qt5/plugins/platforms/libqoffscreen.so
 ${PLIST.unix}qt5/plugins/platforms/libqvnc.so
 ${PLIST.unix}qt5/plugins/platforms/libqxcb.so
 qt5/plugins/platformthemes/libqxdgdesktopportal.so
+${PLIST.gtk3}qt5/plugins/platformthemes/libqgtk3.so
 ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.so
 qt5/plugins/sqldrivers/libqsqlite.so
 ${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so

Index: pkgsrc/x11/qt5-qtbase/options.mk
diff -u pkgsrc/x11/qt5-qtbase/options.mk:1.12 pkgsrc/x11/qt5-qtbase/options.mk:1.13
--- pkgsrc/x11/qt5-qtbase/options.mk:1.12       Sat Jan 26 22:58:04 2019
+++ pkgsrc/x11/qt5-qtbase/options.mk    Wed Jul 24 19:44:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2019/01/26 22:58:04 tnn Exp $
+# $NetBSD: options.mk,v 1.13 2019/07/24 19:44:55 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt5
 PKG_SUPPORTED_OPTIONS+=        cups eglfs gtk3
@@ -6,7 +6,6 @@ PKG_SUPPORTED_OPTIONS+= cups eglfs gtk3
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=           cups
-
 .if !empty(PKG_OPTIONS:Mcups)
 .  include "../../print/cups-base/buildlink3.mk"
 CONFIGURE_ARGS+=       -cups
@@ -21,9 +20,11 @@ CONFIGURE_ARGS+=     -no-cups
 #CONFIGURE_ARGS+=      -no-eglfs
 #.endif
 
+PLIST_VARS+=           gtk3
 .if !empty(PKG_OPTIONS:Mgtk3)
 .  include "../../x11/gtk3/buildlink3.mk"
 CONFIGURE_ARGS+=       -gtk
+PLIST.gtk3=            yes
 .else
 CONFIGURE_ARGS+=       -no-gtk
 .endif