git: f29dd7fb9739 - main - x11/plasma6-plasma-desktop: fix regression after switching to KF6

The branch main has been updated by makc:

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

commit f29dd7fb9739dbf44cf86e08a5cf8353044ce975
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-03-16 19:53:06 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-03-16 21:04:01 +0000

    x11/plasma6-plasma-desktop: fix regression after switching to KF6
    
    - Restore IBUS and SCIM options.
    - Adjust dependencies.
    - Do not install systemd files.
---
 x11/plasma6-plasma-desktop/Makefile  | 32 +++++++++++++++++++++++---------
 x11/plasma6-plasma-desktop/pkg-plist |  8 +++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile
index cbf03bc66604..bfef3f34daa8 100644
--- a/x11/plasma6-plasma-desktop/Makefile
+++ b/x11/plasma6-plasma-desktop/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	plasma-desktop
 DISTVERSION=	${KDE_PLASMA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +12,9 @@ BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols \
 		libinput>0:x11/libinput
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libicuuc.so:devel/icu \
+		libkaccounts6.so:net-im/kaccounts-integration \
 		liboauth2plugin.so:sysutils/signon-plugin-oauth2@qt6 \
+		libpackagekitqt6.so:ports-mgmt/packagekit-qt@qt6 \
 		libwayland-client.so:graphics/wayland \
 		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
@@ -22,8 +24,9 @@ RUN_DEPENDS=	noto-emoji>0:x11-fonts/noto-emoji \
 		xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
 		xf86-input-libinput>0:x11-drivers/xf86-input-libinput
 
-USES=		cmake gettext gl kde:6 pkgconfig python qt:6 tar:xz xorg
+USES=		cmake gettext gl gnome kde:6 pkgconfig python qt:6 tar:xz xorg
 USE_GL=		gl opengl
+USE_GNOME=	intltool
 USE_KDE=	activities activities-stats attica auth baloo bookmarks \
 		codecs colorscheme completion config configwidgets coreaddons \
 		crash dbusaddons doctools filemetadata globalaccel guiaddons \
@@ -34,15 +37,26 @@ USE_KDE=	activities activities-stats attica auth baloo bookmarks \
 		ecm:build \
 		kirigami-addons:run kirigami2:run kpipewire:run \
 		qqc2-desktop-style:run
-USE_QT=		5compat base declarative svg
+USE_QT=		5compat base declarative svg wayland
 USE_XORG=	x11 xcb xcursor xext xfixes xi xrender
 
-OPTIONS_DEFINE=	SDL
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		SDL
+OPTIONS_GROUP=		IM
+IM_DESC=		Input Method Support
+OPTIONS_GROUP_IM=	IBUS SCIM
+OPTIONS_SUB=		yes
 
-SDL_DESC=	Enable gamecontroller System Settings module (requires SDL)
-SDL_USES=	sdl
-SDL_USE=	sdl=sdl2
-SDL_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_SDL2:BOOL=On
+IBUS_DESC=		Enable IBUS backend for input dialog
+IBUS_LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
+IBUS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_IBus
+
+SCIM_DESC=		Enable SCIM backend for input dialog
+SCIM_LIB_DEPENDS=	libscim-1.0.so:textproc/scim
+SCIM_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_SCIM
+
+SDL_DESC=		Enable gamecontroller System Settings module
+SDL_USES=		sdl
+SDL_USE=		sdl=sdl2
+SDL_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_SDL2
 
 .include <bsd.port.mk>
diff --git a/x11/plasma6-plasma-desktop/pkg-plist b/x11/plasma6-plasma-desktop/pkg-plist
index 5b797f8d2e96..b122eeff83fa 100644
--- a/x11/plasma6-plasma-desktop/pkg-plist
+++ b/x11/plasma6-plasma-desktop/pkg-plist
@@ -8,6 +8,10 @@ bin/solid-action-desktop-gen
 bin/tastenbrett
 etc/xdg/autostart/kaccess.desktop
 lib/libexec/kf6/kauth/kcmdatetimehelper
+%%IBUS%%lib/libexec/kimpanel-ibus-panel
+%%IBUS%%lib/libexec/kimpanel-ibus-panel-launcher
+%%SCIM%%lib/libexec/kimpanel-scim-panel
+%%QT_PLUGINDIR%%/attica_kde.so
 %%QT_PLUGINDIR%%/kf6/kded/device_automounter.so
 %%QT_PLUGINDIR%%/kf6/kded/kded_touchpad.so
 %%QT_PLUGINDIR%%/kf6/kded/keyboard.so
@@ -68,7 +72,9 @@ lib/libexec/kf6/kauth/kcmdatetimehelper
 %%QT_QMLDIR%%/org/kde/private/desktopcontainment/folder/kde-qmlmodule.version
 %%QT_QMLDIR%%/org/kde/private/desktopcontainment/folder/libfolderplugin.so
 %%QT_QMLDIR%%/org/kde/private/desktopcontainment/folder/qmldir
-lib/systemd/user/plasma-kaccess.service
+@comment lib/systemd/user/plasma-kaccess.service
+share/accounts/providers/kde/opendesktop.provider
+share/accounts/services/kde/opendesktop-rating.service
 share/applications/kaccess.desktop
 share/applications/kcm_access.desktop
 share/applications/kcm_activities.desktop