Date: Sun, 21 Dec 2025 10:28:35 +0000 From: Jason E. Hale <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0e820f352ed8 - main - devel/qt6-base: Fix packaging when WAYLAND is off globally Message-ID: <6947cbd3.8beb.5eb5f6f7@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e820f352ed8815d768c4985e8644c3934d4db97 commit 0e820f352ed8815d768c4985e8644c3934d4db97 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-12-21 09:49:24 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-12-21 10:28:29 +0000 devel/qt6-base: Fix packaging when WAYLAND is off globally Disable qtwaylandscanner when WAYLAND option is off. One would think this would happen when one wholly disables wayland, but one would only be kidding oneself. This is Qt, afterall. PR: 291835 Reported by: Frank Reisert <bugs@rufus.in-berlin.de> Special thanks: vvd@ for bringing this to my attention on #freebsd-desktop after bugzilla auto-assign failure --- devel/qt6-base/Makefile | 4 +++- devel/qt6-base/pkg-plist | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 1f270aa9ad4b..3520f858266b 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,5 +1,6 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt6- @@ -70,7 +71,8 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= FEATURE_cups WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland -WAYLAND_CMAKE_BOOL= FEATURE_wayland +WAYLAND_CMAKE_BOOL= FEATURE_qtwaylandscanner \ + FEATURE_wayland X11_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index c4360460bfdb..962c4b4e675d 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -3419,16 +3419,16 @@ lib/cmake/Qt6TestPrivate/Qt6TestPrivateVersionlessTargets.cmake %%WAYLAND%%lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateTargets.cmake %%WAYLAND%%lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateVersionlessAliasTargets.cmake %%WAYLAND%%lib/cmake/Qt6WaylandGlobalPrivate/Qt6WaylandGlobalPrivateVersionlessTargets.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandClientMacros.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandCompositorMacros.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsAdditionalTargetInfo.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfig.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfigVersion.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfigVersionImpl.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsDependencies.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsTargets.cmake -lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsVersionlessTargets.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandClientMacros.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandCompositorMacros.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsAdditionalTargetInfo.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfig.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfigVersion.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsConfigVersionImpl.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsDependencies.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsTargets.cmake +%%WAYLAND%%lib/cmake/Qt6WaylandScannerTools/Qt6WaylandScannerToolsVersionlessTargets.cmake lib/cmake/Qt6Widgets/Qt6WidgetsAdditionalTargetInfo.cmake lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake lib/cmake/Qt6Widgets/Qt6WidgetsConfigVersion.cmake @@ -4137,7 +4137,7 @@ libdata/pkgconfig/Qt6Xml.pc %%QT_TOOLDIR%%/qt-internal-configure-tests %%QT_TOOLDIR%%/qt-testrunner.py %%QT_TOOLDIR%%/qvkgen -%%QT_TOOLDIR%%/qtwaylandscanner +%%WAYLAND%%%%QT_TOOLDIR%%/qtwaylandscanner %%QT_TOOLDIR%%/rcc %%QT_TOOLDIR%%/sanitizer-testrunner.py %%QT_TOOLDIR%%/syncqthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6947cbd3.8beb.5eb5f6f7>