diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile index eebc9e1907c9..0c03a7652cce 100644 --- a/x11-wm/theseus-ship/Makefile +++ b/x11-wm/theseus-ship/Makefile @@ -1,46 +1,49 @@ PORTNAME= theseus-ship DISTVERSIONPREFIX= v DISTVERSION= 6.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 01030427325c.patch:-p1 # https://github.com/winft/theseus-ship/pull/17 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland and X11 compositor for KDE Plasma Desktop WWW= https://github.com/winft/theseus-ship LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ libcomo-script.so.0:x11-toolkits/como \ libwlroots-0.18.so:x11-toolkits/wlroots018 \ libxkbcommon.so:x11/libxkbcommon \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-icccm.so:x11/xcb-util-wm CONFLICTS_INSTALL= plasma6-kwin # bin/kwin_wayland USES= cmake:testing gettext-tools kde:6 pkgconfig qt:6 xorg USE_GITHUB= yes USE_KDE= colorscheme config coreaddons crash dbusaddons decoration \ ecm:build globalaccel i18n kcmutils kscreenlocker newstuff:build \ notifications package svg widgetsaddons windowsystem xmlgui USE_LDCONFIG= yes USE_QT= base declarative tools USE_XORG= pixman x11 xcb xi GH_ACCOUNT= winft GH_PROJECT= theseus-ship PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # GL, ICE/SM/Xext, input, KF6Service OPTIONS_DEFINE= BREEZE OPTIONS_DEFAULT=BREEZE BREEZE_DESC= Default window decoration plugin BREEZE_USE= KDE=breeze BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze .include 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 - ) -