git: ec79cba63263 - main - x11-toolkits/kf6-kguiaddons: allow for co-intability with x11-toolkits/kf5-kguiaddons

The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec79cba63263e9de8f188f19d9e71615aaf1cec6

commit ec79cba63263e9de8f188f19d9e71615aaf1cec6
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-12-07 18:42:38 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-12-07 20:11:33 +0000

    x11-toolkits/kf6-kguiaddons: allow for co-intability with x11-toolkits/kf5-kguiaddons
    
    Only build the geo-handler binaries for the kf5 version, and run-depend
    on it instead.
    If no kf5 is required, then the default-on option KF5COMPAT can be
    toggled off.
---
 x11-toolkits/kf6-kguiaddons/Makefile  | 11 +++++++++--
 x11-toolkits/kf6-kguiaddons/pkg-plist | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/x11-toolkits/kf6-kguiaddons/Makefile b/x11-toolkits/kf6-kguiaddons/Makefile
index 943c67c9b5fb..ffd1dc882304 100644
--- a/x11-toolkits/kf6-kguiaddons/Makefile
+++ b/x11-toolkits/kf6-kguiaddons/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kguiaddons
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits kde kde-frameworks
 
 COMMENT=	Utilities for graphical user interfaces
@@ -10,9 +11,15 @@ LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 
 USES=		cmake desktop-file-utils gl kde:6 pkgconfig qt:6 tar:xz xorg
 USE_GL=		gl opengl
-USE_KDE=	ecm:build \
-		plasma-wayland-protocols:build
+USE_KDE=	ecm:build plasma-wayland-protocols:build
 USE_QT=		base wayland
 USE_XORG=	x11 xcb
 
+OPTIONS_DEFINE=		KF5COMPAT
+KF5COMPAT_DESC=		Allow for co-instability with KF5
+KF5COMPAT_CMAKE_BOOL_OFF=	BUILD_GEO_SCHEME_HANDLER
+KF5COMPAT_RUN_DEPENDS=	kde-geo-uri-handler:x11-toolkits/kf5-kguiaddons
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_SUB=		YES
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/kf6-kguiaddons/pkg-plist b/x11-toolkits/kf6-kguiaddons/pkg-plist
index de853a8f5070..9ada2b8e2cc5 100644
--- a/x11-toolkits/kf6-kguiaddons/pkg-plist
+++ b/x11-toolkits/kf6-kguiaddons/pkg-plist
@@ -1,4 +1,4 @@
-bin/kde-geo-uri-handler
+%%NO_KF5COMPAT%%bin/kde-geo-uri-handler
 include/KF6/KGuiAddons/KColorCollection
 include/KF6/KGuiAddons/KColorMimeData
 include/KF6/KGuiAddons/KColorSchemeWatcher
@@ -40,8 +40,8 @@ lib/cmake/KF6GuiAddons/KF6GuiAddonsTargets.cmake
 lib/libKF6GuiAddons.so
 lib/libKF6GuiAddons.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libKF6GuiAddons.so.6
-share/applications/google-maps-geo-handler.desktop
-share/applications/openstreetmap-geo-handler.desktop
-share/applications/qwant-maps-geo-handler.desktop
-share/applications/wheelmap-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/google-maps-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/openstreetmap-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/qwant-maps-geo-handler.desktop
+%%NO_KF5COMPAT%%share/applications/wheelmap-geo-handler.desktop
 share/qlogging-categories6/kguiaddons.categories