7 files changed, 17 insertions, 49 deletions
diff --git a/x11-wm/lxqt-panel/Makefile b/x11-wm/lxqt-panel/Makefile
index 1506b056cd7b..0cc3330a5298 100644
--- a/x11-wm/lxqt-panel/Makefile
+++ b/x11-wm/lxqt-panel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lxqt-panel
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	LXQT
 
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libdbusmenu-lxqt.so:devel/libdbusmenu-lxqt \
 BUILD_DEPENDS=	lxqt-menu-data>=2.0.0:x11/lxqt-menu-data
 RUN_DEPENDS= 	lxqt-menu-data>=2.0.0:x11/lxqt-menu-data
 
-USES=		cmake compiler:c++17-lang gettext-runtime kde:6 qt:6 gnome \
+USES=		cmake compiler:c++20-lang gettext-runtime kde:6 qt:6 gnome \
 		lxqt:2 localbase:ldflags perl5 pkgconfig tar:xz xorg
 USE_PERL5=	build
 USE_QT=		base:run tools:build svg
diff --git a/x11-wm/lxqt-session/Makefile b/x11-wm/lxqt-session/Makefile
index 478cb8273be1..2fcceee4ae08 100644
--- a/x11-wm/lxqt-session/Makefile
+++ b/x11-wm/lxqt-session/Makefile
@@ -13,8 +13,8 @@ LICENSE=	LGPL21+
 BUILD_DEPENDS=	xdg-user-dirs-update:devel/xdg-user-dirs \
 		qtxdg-mat:sysutils/qtxdg-tools
 
-USES=		cmake kde:6 localbase:ldflags perl5 pkgconfig lxqt:2 qt:6 \
-		tar:xz xorg gnome
+USES=		cmake compiler:c++20-lang kde:6 localbase:ldflags perl5 pkgconfig \
+		lxqt:2 qt:6 tar:xz xorg gnome
 USE_QT=		tools:build base:run svg
 USE_KDE=	layer-shell-qt windowsystem
 USE_PERL5=	build
diff --git a/x11-wm/lxqt-wayland-session/Makefile b/x11-wm/lxqt-wayland-session/Makefile
index dd685a230715..dda815696875 100644
--- a/x11-wm/lxqt-wayland-session/Makefile
+++ b/x11-wm/lxqt-wayland-session/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lxqt-wayland-session
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	LXQT
 
@@ -14,8 +14,8 @@ BUILD_DEPENDS=	xdg-user-dirs-update:devel/xdg-user-dirs \
 		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 RUN_DEPENDS=	lxqt-session>=${PORTVERSION}:x11-wm/lxqt-session
 
-USES=		cmake gl localbase:ldflags perl5 pkgconfig lxqt:2 \
-		tar:xz xorg
+USES=		cmake compiler:c++20-lang gl localbase:ldflags perl5 pkgconfig \
+		lxqt:2 tar:xz xorg
 USE_GL=		gl
 USE_PERL5=	build
 USE_XORG=	ice sm xcb xext
diff --git a/x11-wm/obconf-qt/Makefile b/x11-wm/obconf-qt/Makefile
index bd0580f1b440..0eadbbf1c114 100644
--- a/x11-wm/obconf-qt/Makefile
+++ b/x11-wm/obconf-qt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	obconf-qt
 PORTVERSION=	0.16.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	LXQT/${PORTNAME}
 
@@ -15,7 +16,7 @@ LIB_DEPENDS=	libobt.so:x11-wm/openbox \
 		libImlib2.so:graphics/imlib2 \
 		libharfbuzz.so:print/harfbuzz
 
-USES=		cmake compiler:c++17-lang gettext-runtime localbase qt:6 \
+USES=		cmake compiler:c++20-lang gettext-runtime localbase qt:6 \
 		gnome lxqt:2 perl5 pkgconfig tar:xz xorg
 
 USE_PERL5=	build
diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile
index eebc9e1907c9..f8b210a7a404 100644
--- a/x11-wm/theseus-ship/Makefile
+++ b/x11-wm/theseus-ship/Makefile
@@ -1,10 +1,13 @@
 PORTNAME=	theseus-ship
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.2.0
-PORTREVISION=	1
-CATEGORIES=	x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9
+PORTREVISION=	3
+CATEGORIES=	x11-wm wayland
 
-MAINTAINER=	jbeich@FreeBSD.org
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	01030427325c.patch:-p1 # https://github.com/winft/theseus-ship/pull/17
+
+MAINTAINER=	jsm@FreeBSD.org
 COMMENT=	Wayland and X11 compositor for KDE Plasma Desktop
 WWW=		https://github.com/winft/theseus-ship
 
diff --git a/x11-wm/theseus-ship/distinfo b/x11-wm/theseus-ship/distinfo
index d03b229652b4..fc9fcdc4cad3 100644
--- a/x11-wm/theseus-ship/distinfo
+++ b/x11-wm/theseus-ship/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1728505622
 SHA256 (winft-theseus-ship-v6.2.0_GH0.tar.gz) = 1f3567a4b1dd1a69046fe8669d624f4245733a72354025f127e732f4600fde18
 SIZE (winft-theseus-ship-v6.2.0_GH0.tar.gz) = 2693734
+SHA256 (01030427325c.patch) = 0bc1b46f324391ebeaf557b2b281deaa84182db1c7af4cf95f5b9508cf8a10b2
+SIZE (01030427325c.patch) = 56954
diff --git a/x11-wm/theseus-ship/files/patch-plasma-6.1 b/x11-wm/theseus-ship/files/patch-plasma-6.1
deleted file mode 100644
index bb6349fdc8a5..000000000000
--- a/x11-wm/theseus-ship/files/patch-plasma-6.1
+++ /dev/null
@@ -1,39 +0,0 @@
-Drop after x11/plasma6-libplasma >= 6.2.0 update
-Drop after x11-wm/plasma6-kdecoration >= 6.2.0
-
-CMake Warning at CMakeLists.txt:59 (find_package):
-  Could not find a configuration file for package "Plasma" that is compatible
-  with requested version "6.1".
-
-  The following configuration files were considered but not accepted:
-
-    /usr/local/lib/cmake/Plasma/PlasmaConfig.cmake, version: 6.1.2
-
-CMake Error at CMakeLists.txt:69 (find_package):
-  Could not find a configuration file for package "KDecoration2" that is
-  compatible with requested version "6.2".
-
-  The following configuration files were considered but not accepted:
-
-    /usr/local/lib/cmake/KDecoration2/KDecoration2Config.cmake, version: 6.1.2
-
---- CMakeLists.txt.orig	2024-10-09 20:27:02 UTC
-+++ CMakeLists.txt
-@@ -57,7 +57,7 @@ set_package_properties(KF6Kirigami PROPERTIES
-     TYPE RUNTIME
- )
- 
--find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
-+find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR}
-   CONFIG
- )
- set_package_properties(Plasma PROPERTIES
-@@ -66,7 +66,7 @@ set_package_properties(Plasma PROPERTIES
-     TYPE RUNTIME
- )
- 
--find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
-+find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}
-   CONFIG REQUIRED
- )
-