git: a8e6bc89bec8 - main - x11-toolkits/como: update to 0.2.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 21 Jun 2024 20:33:07 UTC 
The branch main has been updated by jbeich:

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

commit a8e6bc89bec84c864653641623cf60e1732d15a4
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-06-19 18:07:57 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-06-21 20:26:58 +0000

    x11-toolkits/como: update to 0.2.0
    
    Changes:        https://github.com/winft/como/releases/tag/v0.2.0
    Reported by:    GitHub (watch releases)
---
 x11-toolkits/como/Makefile               |  6 ++----
 x11-toolkits/como/distinfo               | 10 +++-------
 x11-toolkits/como/files/patch-plasma-6.0 | 19 +++++++++++++++++++
 x11-toolkits/como/pkg-plist              |  8 ++++++--
 x11-wm/theseus-ship/Makefile             |  2 ++
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile
index b0e64b7ac2b7..11d4189074b3 100644
--- a/x11-toolkits/como/Makefile
+++ b/x11-toolkits/como/Makefile
@@ -1,13 +1,11 @@
 PORTNAME=	como
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.0
+DISTVERSION=	0.2.0
 CATEGORIES=	x11-toolkits
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	7586d3cd718e.patch:-p1 # https://github.com/winft/como/pull/16
 PATCHFILES+=	325e41b02b58.patch:-p1 # https://github.com/winft/como/pull/22
 PATCHFILES+=	d250e3a81b91.patch:-p1 # https://github.com/winft/como/pull/22
-PATCHFILES+=	9775ff231660.patch:-p1 # https://github.com/winft/como/pull/23
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Compositor Modules for Wayland and X11
@@ -33,7 +31,7 @@ USES=		cmake:testing gettext-tools kde:6 pkgconfig \
 USE_GITHUB=	yes
 USE_KDE=	auth colorscheme config configwidgets coreaddons \
 		decoration ecm:build globalaccel i18n idletime kcmutils \
-		kscreenlocker:build newstuff:build package service svg \
+		kscreenlocker newstuff:build package service svg \
 		widgetsaddons windowsystem
 USE_LDCONFIG=	yes
 USE_QT=		base declarative tools
diff --git a/x11-toolkits/como/distinfo b/x11-toolkits/como/distinfo
index aefba975e57b..96b9630c9491 100644
--- a/x11-toolkits/como/distinfo
+++ b/x11-toolkits/como/distinfo
@@ -1,13 +1,9 @@
-TIMESTAMP = 1709038951
-SHA256 (winft-como-v0.1.0_GH0.tar.gz) = 49d9b8b8b8197f4443f8eae71db8adecf51da73c221a4712d0d8cc46b9fdc09f
-SIZE (winft-como-v0.1.0_GH0.tar.gz) = 4158608
+TIMESTAMP = 1718820477
+SHA256 (winft-como-v0.2.0_GH0.tar.gz) = 24a43c5cb49760eb89f0414aa03f0007441fb2b8ef934e9ccb39af01646a27a9
+SIZE (winft-como-v0.2.0_GH0.tar.gz) = 4164563
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
-SHA256 (7586d3cd718e.patch) = 853e967656e730a80d2e2d926e974805285a71eb2b3fee6a2524da7d5ee6bb7b
-SIZE (7586d3cd718e.patch) = 957
 SHA256 (325e41b02b58.patch) = 930ee700ce7d27c9fe4dd6aa0fb4771034ae0bad072b11323f99e8fd524bebf2
 SIZE (325e41b02b58.patch) = 1462
 SHA256 (d250e3a81b91.patch) = 7ed00b787c17b9bcbc33e94162b9281dd935e541b4b88f8ed2ebdf715f7db828
 SIZE (d250e3a81b91.patch) = 1196
-SHA256 (9775ff231660.patch) = 68630e86840710575c58e501f894745ffa5e5cdf1c1de42d8f2c789a06a50e52
-SIZE (9775ff231660.patch) = 1016
diff --git a/x11-toolkits/como/files/patch-plasma-6.0 b/x11-toolkits/como/files/patch-plasma-6.0
new file mode 100644
index 000000000000..1ea9c03af3c1
--- /dev/null
+++ b/x11-toolkits/como/files/patch-plasma-6.0
@@ -0,0 +1,19 @@
+Drop after x11-wm/plasma6-kdecoration >= 6.1.0
+
+https://github.com/winft/como/commit/3155adace1ce
+https://invent.kde.org/plasma/kdecoration/-/commit/4612e0f003a3
+
+como/win/deco/settings.h:113:59: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType'
+        s_buttonNames[KDecoration2::DecorationButtonType::Spacer] = QChar('_');
+                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
+
+--- como/win/deco/settings.h.orig	2024-06-19 18:07:57 UTC
++++ como/win/deco/settings.h
+@@ -110,7 +110,6 @@ class settings : public QObject, public KDecoration2::
+         s_buttonNames[KDecoration2::DecorationButtonType::KeepAbove] = QChar('F');
+         s_buttonNames[KDecoration2::DecorationButtonType::KeepBelow] = QChar('B');
+         s_buttonNames[KDecoration2::DecorationButtonType::Shade] = QChar('L');
+-        s_buttonNames[KDecoration2::DecorationButtonType::Spacer] = QChar('_');
+     }
+ 
+     QString buttonsToString(QVector<KDecoration2::DecorationButtonType> const& buttons) const
diff --git a/x11-toolkits/como/pkg-plist b/x11-toolkits/como/pkg-plist
index 3b8ac6eb6fdf..224090cea56e 100644
--- a/x11-toolkits/como/pkg-plist
+++ b/x11-toolkits/como/pkg-plist
@@ -32,8 +32,8 @@ include/como/base/wayland/output_helpers.h
 include/como/base/wayland/output_transform.h
 include/como/base/wayland/platform.h
 include/como/base/wayland/platform_helpers.h
-include/como/base/wayland/screen_lock.h
 include/como/base/wayland/server.h
+include/como/base/wayland/server_helpers.h
 include/como/base/wayland/xwl_platform.h
 include/como/base/x11/app_singleton.h
 include/como/base/x11/atoms.h
@@ -78,8 +78,10 @@ include/como/debug/support_info.h
 include/como/debug/ui_debug_console.h
 include/como/desktop/kde/dbus/kwin.h
 include/como/desktop/kde/platform.h
+include/como/desktop/kde/screen_locker.h
 include/como/desktop/kde/service_utils.h
 include/como/desktop/platform.h
+include/como/desktop/screen_locker.h
 include/como/desktop/screen_locker_watcher.h
 include/como/input/backend/wlroots/backend.h
 include/como/input/backend/wlroots/control/control.h
@@ -130,7 +132,6 @@ include/como/input/filters/move_resize.h
 include/como/input/filters/popup.h
 include/como/input/filters/screen_edge.h
 include/como/input/filters/tabbox.h
-include/como/input/filters/terminate_server.h
 include/como/input/filters/virtual_terminal.h
 include/como/input/filters/window_action.h
 include/como/input/filters/window_selector.h
@@ -494,6 +495,7 @@ include/como/win/wayland/plasma_shell.h
 include/como/win/wayland/plasma_window.h
 include/como/win/wayland/popup_placement.h
 include/como/win/wayland/scene.h
+include/como/win/wayland/screen_lock.h
 include/como/win/wayland/session_manager.h
 include/como/win/wayland/setup.h
 include/como/win/wayland/space.h
@@ -635,6 +637,8 @@ lib/libcomo-debug-common.so.0
 lib/libcomo-debug-common.so.%%VERSION%%
 lib/libcomo-debug-wl.so.0
 lib/libcomo-debug-wl.so.%%VERSION%%
+lib/libcomo-desktop-kde-wl.so.0
+lib/libcomo-desktop-kde-wl.so.%%VERSION%%
 lib/libcomo-desktop-kde.so.0
 lib/libcomo-desktop-kde.so.%%VERSION%%
 lib/libcomo-desktop.so.0
diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile
index 069aebb43fc0..7ec625ef0fbc 100644
--- a/x11-wm/theseus-ship/Makefile
+++ b/x11-wm/theseus-ship/Makefile
@@ -10,6 +10,8 @@ WWW=		https://github.com/winft/theseus-ship
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		fails to build with como-0.2.0
+
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libwayland-server.so:graphics/wayland \
 		libWraplandServer.so:graphics/wrapland \