diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile index 620f6734e5eb..158bbba16665 100644 --- a/x11-wm/theseus-ship/Makefile +++ b/x11-wm/theseus-ship/Makefile @@ -1,48 +1,45 @@ PORTNAME= theseus-ship DISTVERSIONPREFIX= v -DISTVERSION= 6.1.0 -PORTREVISION= 1 +DISTVERSION= 6.2.0 CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9 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 -BROKEN= fails to build with como-0.3.0 - LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ libcomo-script.so.0:x11-toolkits/como \ - libwlroots.so:x11-toolkits/wlroots017 \ + libwlroots-0.18.so:x11-toolkits/wlroots \ 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 f04af2210798..d03b229652b4 100644 --- a/x11-wm/theseus-ship/distinfo +++ b/x11-wm/theseus-ship/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718822874 -SHA256 (winft-theseus-ship-v6.1.0_GH0.tar.gz) = dd3bb31644636e4d3e855df36b4467b20312184ac2b5462594c211107f36824c -SIZE (winft-theseus-ship-v6.1.0_GH0.tar.gz) = 2693171 +TIMESTAMP = 1728505622 +SHA256 (winft-theseus-ship-v6.2.0_GH0.tar.gz) = 1f3567a4b1dd1a69046fe8669d624f4245733a72354025f127e732f4600fde18 +SIZE (winft-theseus-ship-v6.2.0_GH0.tar.gz) = 2693734 diff --git a/x11-wm/theseus-ship/files/patch-plasma-6.1 b/x11-wm/theseus-ship/files/patch-plasma-6.1 new file mode 100644 index 000000000000..bb6349fdc8a5 --- /dev/null +++ b/x11-wm/theseus-ship/files/patch-plasma-6.1 @@ -0,0 +1,39 @@ +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 + ) +