aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-02-27 13:20:11 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-04-13 05:09:13 +0000
commitd3293a94a032d3953e1283ffdf52709d725d40ee (patch)
tree8326be925a16228e83a4f6203e390b0511d399ef
parent921977dfbce949edd96940f81a1911ece0740e0b (diff)
downloadports-d3293a94a032d3953e1283ffdf52709d725d40ee.tar.gz
ports-d3293a94a032d3953e1283ffdf52709d725d40ee.zip
x11/disman: update to 0.600.0
Changes: https://github.com/winft/disman/releases/v0.600.0 Reported by: GitHub (watch releases)
-rw-r--r--x11/disman/Makefile23
-rw-r--r--x11/disman/distinfo6
-rw-r--r--x11/disman/files/patch-CMakeLists.txt43
-rw-r--r--x11/disman/files/patch-backends_CMakeLists.txt21
-rw-r--r--x11/disman/files/patch-optional-deps77
-rw-r--r--x11/disman/pkg-plist21
-rw-r--r--x11/kdisplay/Makefile2
7 files changed, 59 insertions, 134 deletions
diff --git a/x11/disman/Makefile b/x11/disman/Makefile
index a59e93016f1d..aac2f873d5f9 100644
--- a/x11/disman/Makefile
+++ b/x11/disman/Makefile
@@ -1,6 +1,6 @@
PORTNAME= disman
-DISTVERSIONPREFIX= ${PORTNAME}@
-DISTVERSION= 0.527.0
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.600.0
CATEGORIES= x11
MAINTAINER= jbeich@FreeBSD.org
@@ -10,17 +10,13 @@ WWW= https://github.com/winft/disman
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-BROKEN= fails to build with wrapland 0.600
-
-TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
-
-USES= cmake:testing kde:5 pathfix qt:5
+USES= cmake:testing kde:6 pathfix qt:6
USE_GITHUB= yes
-USE_KDE= ecm:build coreaddons
+USE_KDE= ecm:build
USE_LDCONFIG= yes
-USE_QT= qmake:build buildtools:build core dbus gui
+USE_QT= base
GH_ACCOUNT= winft
-WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/@/-/}
+LDFLAGS+= -Wl,--as-needed # GL, xkbcommon
PLIST_SUB= VERSION=${PORTVERSION}
OPTIONS_DEFINE= WAYLAND X11
@@ -28,12 +24,11 @@ OPTIONS_DEFAULT=WAYLAND X11
OPTIONS_SUB= yes
WAYLAND_LIB_DEPENDS= libWraplandClient.so:graphics/wrapland
-WAYLAND_USE= KDE=wayland
-WAYLAND_CMAKE_BOOL_OFF= ${KF5Wayland Wrapland:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/}
+WAYLAND_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Wrapland
X11_USES= xorg
-X11_USE= QT=x11extras XORG=xcb
-X11_CMAKE_BOOL_OFF= ${Qt5X11Extras XCB:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/}
+X11_USE= XORG=xcb
+X11_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_XCB
post-patch:
# Respect PREFIX for hwdata
diff --git a/x11/disman/distinfo b/x11/disman/distinfo
index 8293a7b6e80b..56a326e5756f 100644
--- a/x11/disman/distinfo
+++ b/x11/disman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676648351
-SHA256 (winft-disman-disman@0.527.0_GH0.tar.gz) = 4398d0b044d2021441db084138fd28d741a34a79c9e54e86a31705d706f5b8f2
-SIZE (winft-disman-disman@0.527.0_GH0.tar.gz) = 150355
+TIMESTAMP = 1709040011
+SHA256 (winft-disman-v0.600.0_GH0.tar.gz) = bf584ab99b585f4d88a6e0310b71d5aab500361ae8369acab0d2a0cd1abe784c
+SIZE (winft-disman-v0.600.0_GH0.tar.gz) = 147682
diff --git a/x11/disman/files/patch-CMakeLists.txt b/x11/disman/files/patch-CMakeLists.txt
index 578f05f6f75b..c434ac2f1311 100644
--- a/x11/disman/files/patch-CMakeLists.txt
+++ b/x11/disman/files/patch-CMakeLists.txt
@@ -1,25 +1,24 @@
-CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
- find_package for module Qt5Test called with REQUIRED, but
- CMAKE_DISABLE_FIND_PACKAGE_Qt5Test is enabled. A REQUIRED package cannot
- be disabled.
-Call Stack (most recent call first):
- CMakeLists.txt:27 (find_package)
+Drop unused dependencies (kf6-kwayland isn't packaged, anyway)
---- CMakeLists.txt.orig 2022-06-14 20:05:24 UTC
+--- CMakeLists.txt.orig 2024-02-27 13:20:11 UTC
+++ CMakeLists.txt
-@@ -34,7 +34,6 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
- Core
- DBus
- Gui
-- Test
- OPTIONAL_COMPONENTS
- X11Extras
+@@ -35,19 +35,6 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED
+ Test
)
-@@ -72,6 +71,7 @@ if(BUILD_TESTING)
- add_subdirectory(ctl)
- add_subdirectory(backends)
- if(BUILD_TESTING)
-+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Test)
- add_subdirectory(autotests)
- add_subdirectory(tests)
- endif()
+
+-find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS
+- CoreAddons
+- Wayland
+-)
+-set_package_properties(KF6CoreAddons PROPERTIES
+- TYPE REQUIRED
+- PURPOSE "For loading Wayland backend plugins"
+-)
+-set_package_properties(KF6Wayland PROPERTIES
+- TYPE OPTIONAL
+- PURPOSE "Required for KWin/KWayland backend"
+-)
+-
+ find_package(Wrapland ${PROJECT_VERSION} CONFIG)
+ set_package_properties(Wrapland PROPERTIES
+ TYPE OPTIONAL
diff --git a/x11/disman/files/patch-backends_CMakeLists.txt b/x11/disman/files/patch-backends_CMakeLists.txt
new file mode 100644
index 000000000000..86eb63d29502
--- /dev/null
+++ b/x11/disman/files/patch-backends_CMakeLists.txt
@@ -0,0 +1,21 @@
+Revert https://github.com/winft/disman/commit/78771e145b7f
+and https://github.com/winft/disman/commit/18d0a3aa7940
+to support disabling build dependencies at configure (CMake) time.
+
+In file included from backends/wayland/waylandscreen.cpp:20:
+backends/wayland/waylandoutput.h:24:10: fatal error: 'Wrapland/Client/registry.h' file not found
+#include <Wrapland/Client/registry.h>
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- backends/CMakeLists.txt.orig 2024-02-27 13:20:11 UTC
++++ backends/CMakeLists.txt
+@@ -37,5 +37,9 @@ add_subdirectory(qscreen)
+ ####################################################################################################
+ add_subdirectory(fake)
+ add_subdirectory(qscreen)
++if(Wrapland_FOUND)
+ add_subdirectory(wayland)
++endif()
++if(XCB_RANDR_FOUND)
+ add_subdirectory(xrandr)
++endif()
diff --git a/x11/disman/files/patch-optional-deps b/x11/disman/files/patch-optional-deps
deleted file mode 100644
index 3633afdbd833..000000000000
--- a/x11/disman/files/patch-optional-deps
+++ /dev/null
@@ -1,77 +0,0 @@
-Revert https://github.com/winft/disman/commit/78771e145b7f
-and https://github.com/winft/disman/commit/18d0a3aa7940
-to support disabling build dependencies at configure (CMake) time.
-
-CMake Error at backends/wayland/plugins/kwayland/CMakeLists.txt:21 (target_link_libraries):
- Target "disman-kwayland" links to:
-
- KF5::WaylandClient
-
- but the target was not found. Possible reasons include:
-
- * There is a typo in the target name.
- * A find_package call is missing for an IMPORTED target.
- * An ALIAS target is missing.
-
-CMake Error at /usr/local/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
- find_package for module Qt5X11Extras called with REQUIRED, but
- CMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras is enabled. A REQUIRED package
- cannot be disabled.
-Call Stack (most recent call first):
- CMakeLists.txt:32 (find_package)
-
---- CMakeLists.txt.orig 2022-06-14 20:05:24 UTC
-+++ CMakeLists.txt
-@@ -34,9 +34,14 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
- Core
- DBus
- Gui
-+)
-+
-+# XXX REQUIRED negates TYPE OPTIONAL
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG
- OPTIONAL_COMPONENTS
- X11Extras
- )
-+
- set_package_properties(Qt5X11Extras PROPERTIES
- PURPOSE "Required for X11/RandR backend"
- )
---- backends/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC
-+++ backends/CMakeLists.txt
-@@ -35,4 +35,10 @@ add_subdirectory(wayland)
- add_subdirectory(fake)
- add_subdirectory(qscreen)
- add_subdirectory(wayland)
--add_subdirectory(xrandr)
-+
-+if(${XCB_RANDR_FOUND})
-+ message(STATUS "Will build xrandr backend.")
-+ add_subdirectory(xrandr)
-+else()
-+ message(STATUS "Not building xrandr backend, no XCB_RANDR_FOUND set.")
-+endif()
---- backends/wayland/plugins/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC
-+++ backends/wayland/plugins/CMakeLists.txt
-@@ -1,3 +1,8 @@
--add_subdirectory(kwayland)
--add_subdirectory(kwinft)
--add_subdirectory(wlroots)
-+if(KF5Wayland_FOUND)
-+ add_subdirectory(kwayland)
-+endif()
-+
-+if(Wrapland_FOUND)
-+ add_subdirectory(kwinft)
-+ add_subdirectory(wlroots)
-+endif()
---- backends/xrandr/CMakeLists.txt.orig 2022-06-14 20:05:24 UTC
-+++ backends/xrandr/CMakeLists.txt
-@@ -1,3 +1,7 @@
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-+ X11Extras
-+)
-+
- set(xrandr_SRCS
- xrandr.cpp
- xrandrconfig.cpp
diff --git a/x11/disman/pkg-plist b/x11/disman/pkg-plist
index c43862cc6c23..2b07bdf64a1f 100644
--- a/x11/disman/pkg-plist
+++ b/x11/disman/pkg-plist
@@ -12,34 +12,19 @@ include/disman/output.h
include/disman/screen.h
include/disman/setconfigoperation.h
include/disman/types.h
-include/disman/wayland/dismanwl_export.h
-include/disman/wayland/wayland_interface.h
-include/disman/wayland/waylandoutput.h
include/disman_version.h
-include/dismanwl_version.h
lib/cmake/disman/disman-config-version.cmake
lib/cmake/disman/disman-config.cmake
lib/cmake/disman/disman-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/disman/disman-targets.cmake
-lib/cmake/dismanwl/dismanwl-config-version.cmake
-lib/cmake/dismanwl/dismanwl-config.cmake
-lib/cmake/dismanwl/dismanwl-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/dismanwl/dismanwl-targets.cmake
lib/libdisman.so
-lib/libdisman.so.%%VERSION%%
lib/libdisman.so.0
-lib/libdismanwl.so
-lib/libdismanwl.so.%%VERSION%%
-lib/libdismanwl.so.0
+lib/libdisman.so.%%VERSION%%
lib/libexec/disman-launcher
%%QT_PLUGINDIR%%/disman/fake.so
%%QT_PLUGINDIR%%/disman/qscreen.so
%%X11%%%%QT_PLUGINDIR%%/disman/randr.so
-%%QT_PLUGINDIR%%/disman/wayland.so
-%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/kwayland.so
-%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/kwinft.so
-%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland/wlroots.so
+%%WAYLAND%%%%QT_PLUGINDIR%%/disman/wayland.so
libdata/pkgconfig/disman.pc
-libdata/pkgconfig/dismanwl.pc
share/dbus-1/services/org.kwinft.disman.service
-share/qlogging-categories5/disman.categories
+share/qlogging-categories6/disman.categories
diff --git a/x11/kdisplay/Makefile b/x11/kdisplay/Makefile
index ab2fd6cecc93..179697b2501b 100644
--- a/x11/kdisplay/Makefile
+++ b/x11/kdisplay/Makefile
@@ -13,6 +13,8 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPL
+BROKEN= fails to build with disman 0.600
+
LIB_DEPENDS= libdisman.so:x11/disman
TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT}