1
0
forked from ports/opt

qt6-base: added more informative check for x11-platform support

This commit is contained in:
Tim Biermann 2024-04-07 19:26:03 +02:00
parent 662387098d
commit b57145dd44
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 15 additions and 43 deletions

@ -1179,7 +1179,6 @@ drwxr-xr-x root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qtguiglobal_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qtriangulatingstroker_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qtriangulator_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qtx11extras_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qundostack_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qunixeventdispatcher_qpa_p.h
-rw-r--r-- root/root usr/include/qt6/QtGui/6.7.0/QtGui/private/qvectorpath_p.h
@ -3018,24 +3017,6 @@ drwxr-xr-x root/root usr/lib/cmake/Qt6Gui/
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginConfigVersionImpl.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersion.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersionImpl.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersion.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersionImpl.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersion.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersionImpl.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfigVersion.cmake
@ -3178,15 +3159,6 @@ drwxr-xr-x root/root usr/lib/cmake/Qt6WidgetsTools/
-rw-r--r-- root/root usr/lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsVersionlessTargets.cmake
drwxr-xr-x root/root usr/lib/cmake/Qt6XcbQpaPrivate/
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfig.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersion.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersionImpl.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateDependencies.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets-release.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateVersionlessTargets.cmake
drwxr-xr-x root/root usr/lib/cmake/Qt6Xml/
-rw-r--r-- root/root usr/lib/cmake/Qt6Xml/Qt6XmlAdditionalTargetInfo.cmake
-rw-r--r-- root/root usr/lib/cmake/Qt6Xml/Qt6XmlConfig.cmake
@ -3262,10 +3234,6 @@ lrwxrwxrwx root/root usr/lib/libQt6Test.so.6 -> libQt6Test.so.6.7.0
lrwxrwxrwx root/root usr/lib/libQt6Widgets.so -> libQt6Widgets.so.6
lrwxrwxrwx root/root usr/lib/libQt6Widgets.so.6 -> libQt6Widgets.so.6.7.0
-rwxr-xr-x root/root usr/lib/libQt6Widgets.so.6.7.0
-rw-r--r-- root/root usr/lib/libQt6XcbQpa.prl
lrwxrwxrwx root/root usr/lib/libQt6XcbQpa.so -> libQt6XcbQpa.so.6
lrwxrwxrwx root/root usr/lib/libQt6XcbQpa.so.6 -> libQt6XcbQpa.so.6.7.0
-rwxr-xr-x root/root usr/lib/libQt6XcbQpa.so.6.7.0
-rw-r--r-- root/root usr/lib/libQt6Xml.prl
lrwxrwxrwx root/root usr/lib/libQt6Xml.so -> libQt6Xml.so.6
lrwxrwxrwx root/root usr/lib/libQt6Xml.so.6 -> libQt6Xml.so.6.7.0
@ -3321,7 +3289,6 @@ drwxr-xr-x root/root usr/lib/qt6/metatypes/
-rw-r--r-- root/root usr/lib/qt6/metatypes/qt6sql_release_metatypes.json
-rw-r--r-- root/root usr/lib/qt6/metatypes/qt6test_release_metatypes.json
-rw-r--r-- root/root usr/lib/qt6/metatypes/qt6widgets_release_metatypes.json
-rw-r--r-- root/root usr/lib/qt6/metatypes/qt6xcbqpaprivate_release_metatypes.json
-rw-r--r-- root/root usr/lib/qt6/metatypes/qt6xml_release_metatypes.json
drwxr-xr-x root/root usr/lib/qt6/mkspecs/
drwxr-xr-x root/root usr/lib/qt6/mkspecs/aix-g++-64/
@ -3834,7 +3801,6 @@ drwxr-xr-x root/root usr/lib/qt6/mkspecs/modules/
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_testlib_private.pri
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_widgets.pri
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_widgets_private.pri
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_xml.pri
-rw-r--r-- root/root usr/lib/qt6/mkspecs/modules/qt_lib_xml_private.pri
drwxr-xr-x root/root usr/lib/qt6/mkspecs/netbsd-g++/
@ -3957,7 +3923,6 @@ drwxr-xr-x root/root usr/lib/qt6/modules/
-rw-r--r-- root/root usr/lib/qt6/modules/Sql.json
-rw-r--r-- root/root usr/lib/qt6/modules/Test.json
-rw-r--r-- root/root usr/lib/qt6/modules/Widgets.json
-rw-r--r-- root/root usr/lib/qt6/modules/XcbQpaPrivate.json
-rw-r--r-- root/root usr/lib/qt6/modules/Xml.json
drwxr-xr-x root/root usr/lib/qt6/plugins/
drwxr-xr-x root/root usr/lib/qt6/plugins/egldeviceintegrations/
@ -3988,7 +3953,6 @@ drwxr-xr-x root/root usr/lib/qt6/plugins/platforms/
-rwxr-xr-x root/root usr/lib/qt6/plugins/platforms/libqminimalegl.so
-rwxr-xr-x root/root usr/lib/qt6/plugins/platforms/libqoffscreen.so
-rwxr-xr-x root/root usr/lib/qt6/plugins/platforms/libqvnc.so
-rwxr-xr-x root/root usr/lib/qt6/plugins/platforms/libqxcb.so
drwxr-xr-x root/root usr/lib/qt6/plugins/platformthemes/
-rwxr-xr-x root/root usr/lib/qt6/plugins/platformthemes/libqxdgdesktopportal.so
drwxr-xr-x root/root usr/lib/qt6/plugins/sqldrivers/
@ -3996,9 +3960,6 @@ drwxr-xr-x root/root usr/lib/qt6/plugins/sqldrivers/
drwxr-xr-x root/root usr/lib/qt6/plugins/tls/
-rwxr-xr-x root/root usr/lib/qt6/plugins/tls/libqcertonlybackend.so
-rwxr-xr-x root/root usr/lib/qt6/plugins/tls/libqopensslbackend.so
drwxr-xr-x root/root usr/lib/qt6/plugins/xcbglintegrations/
-rwxr-xr-x root/root usr/lib/qt6/plugins/xcbglintegrations/libqxcb-egl-integration.so
-rwxr-xr-x root/root usr/lib/qt6/plugins/xcbglintegrations/libqxcb-glx-integration.so
-rwxr-xr-x root/root usr/lib/qt6/qlalr
-rwxr-xr-x root/root usr/lib/qt6/qt-cmake-private
-rw-r--r-- root/root usr/lib/qt6/qt-cmake-private-install.cmake

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/YTt9+BxQ7fjuSEOwRLjBD4qS0OUMRZLEj+erJRabpiHNJ7Qs25EU4u/6cndJETZb4JXmIAqofztLcF/s5t3rQ8=
SHA256 (Pkgfile) = aee0be00c7b77d66fb09e5b087bb059cb0217f0b8ac468e2724a2069b317cd94
SHA256 (.footprint) = 27b8a47dc17732a5dd513a1431777f2ed638954424801c1856b2e73b90f4faae
RWSE3ohX2g5d/e0jHOMlqokxUFQRiGiQ7SzBMdOlBlWeL/KT2T9zvgyDOoXdgSycfx6v42uK3tkJ1hjTFP7tSz9TZ+5ZW0mKNA4=
SHA256 (Pkgfile) = 2a30ab98d7d1fe4137c49a347948610c225cf35e02cd452c0a923f7bde215c76
SHA256 (.footprint) = a8f29665c302ab1ff0823126a39391f31f369effbaf996badc59d27aa04572db
SHA256 (qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
SHA256 (qt6-base-cflags.patch) = cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c
SHA256 (qt6-base-nostrip.patch) = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094

@ -19,7 +19,18 @@ build() {
prt-get isinst ccache && PKGMK_QT6+=' -D QT_USE_CCACHE=ON' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
[[ -e /usr/include/xkbcommon/xkbcommon-x11.h ]] && PKGMK_QT6+=' -D QT_FEATURE_xcb=ON -D QT_FEATURE_xkbcommon_x11=ON' || PKGMK_QT6+=' -D QT_FEATURE_xcb=OFF -D QT_FEATURE_xkbcommon_x11=OFF'
if [[ -e /usr/include/xkbcommon/xkbcommon-x11.h ]]; then
PKGMK_QT6+=' -D QT_FEATURE_xcb=ON -D QT_FEATURE_xkbcommon_x11=ON'
else
PKGMK_QT6+=' -D QT_FEATURE_xcb=OFF -D QT_FEATURE_xkbcommon_x11=OFF'
printf '\e[33m%s\e[m\n' "
Your currently installed version of opt/libxkbcommon is not providing
support for the x11-platform.
This is not mandatory at this point, but depending on your needs, you may
want to install xorg/xkeyboard-config, rebuild opt/libxkbcommon and then
build opt/qt6-base again.
"
fi
cmake -S qtbase-everywhere-src-$version -B build -G Ninja $PKGMK_QT6 \
-D BUILD_SHARED_LIBS=ON \