diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile index f6fa34ec2a32..2991bf041990 100644 --- a/x11-wm/kwinft/Makefile +++ b/x11-wm/kwinft/Makefile @@ -1,64 +1,66 @@ PORTNAME= kwinft DISTVERSIONPREFIX= ${PORTNAME}@ DISTVERSION= 5.23.0 CATEGORIES= x11-wm PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 4d47897f7cc5.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/merge_requests/134 PATCHFILES+= ac7b3268dbc3.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/merge_requests/134 +PATCHFILES+= 0499e4cd8162.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/issues/209 +PATCHFILES+= e80b91d5bc45.patch:-p1 # https://gitlab.com/kwinft/kwinft/-/issues/210 MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland compositor and X11 window manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-server.so:graphics/wayland \ libWraplandServer.so:graphics/wrapland \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-icccm.so:x11/xcb-util-wm TEST_DEPENDS= ${qt-testlib_PORT:T}>0:${qt-testlib_PORT} CONFLICTS_INSTALL= plasma5-kwin # bin/kwin_wayland USES= cmake:testing gl kde:5 pkgconfig python:run qt:5 shebangfix xorg USE_GITLAB= yes USE_GL= egl gbm USE_KDE= ecm_build activities auth completion config configwidgets \ coreaddons crash decoration globalaccel i18n iconthemes \ idletime kcmutils kdeclarative kio kscreenlocker newstuff \ notifications package plasma-framework service textwidgets \ widgetsaddons windowsystem xmlgui USE_LDCONFIG= yes USE_QT= qmake_build buildtools_build core dbus declarative gui \ multimedia_run quickcontrols2_run widgets x11extras USE_XORG= x11 xcb xi SHEBANG_FILES= kconf_update/*.py kconf_update/*.pl GL_COMMIT= 13be8a5795369b6744a5b4a1cb80dc781144cab8 PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # GL, ICE/SM/Xext, epoll-shim, glib, intl, Qt5*, KF5* OPTIONS_DEFINE= BREEZE DOCS QA11Y OPTIONS_DEFAULT=BREEZE QA11Y BREEZE_DESC= Default window decoration plugin BREEZE_USE= KDE=breeze BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze DOCS_USE= KDE=doctools_build DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools QA11Y_DESC= Accessibility (focus tracking) for Zoom effect QA11Y_LIB_DEPENDS= libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient QA11Y_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient .include diff --git a/x11-wm/kwinft/distinfo b/x11-wm/kwinft/distinfo index 24fc41e879fe..c190c8145061 100644 --- a/x11-wm/kwinft/distinfo +++ b/x11-wm/kwinft/distinfo @@ -1,7 +1,11 @@ TIMESTAMP = 1634224922 SHA256 (kwinft-kwinft-13be8a5795369b6744a5b4a1cb80dc781144cab8_GL0.tar.gz) = 7a1f7de9e0ba028e45f50f5a4ed2879af4bf11243e64620875e0401c4eb3dbab SIZE (kwinft-kwinft-13be8a5795369b6744a5b4a1cb80dc781144cab8_GL0.tar.gz) = 4814244 SHA256 (4d47897f7cc5.patch) = 253a4822219f587b567812262de99fac781e440353847c21e4bf1431950ede9e SIZE (4d47897f7cc5.patch) = 1081 SHA256 (ac7b3268dbc3.patch) = ceb26e10c1810ec5a70c28354ed93a23f72b9d24b3c6c2e0ff4eec389ce5082e SIZE (ac7b3268dbc3.patch) = 868 +SHA256 (0499e4cd8162.patch) = 04914da119da76f3df03b074052cf676f3a5eeccae78e7c5535fb763aca1e927 +SIZE (0499e4cd8162.patch) = 869 +SHA256 (e80b91d5bc45.patch) = e9896145de5e7f3c4f51d1707442d5afbcf87757e5f6978b3c0084ecf608fb09 +SIZE (e80b91d5bc45.patch) = 827 diff --git a/x11-wm/kwinft/files/patch-CMakeLists.txt b/x11-wm/kwinft/files/patch-CMakeLists.txt deleted file mode 100644 index 81c7ee253a85..000000000000 --- a/x11-wm/kwinft/files/patch-CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -https://gitlab.com/kwinft/kwinft/-/issues/209 - -CMake Error at CMakeLists.txt:816 (add_executable): - Target "kwin_wayland" links to target "Threads::Threads" but the target was - not found. Perhaps a find_package() call is missing for an IMPORTED - target, or an ALIAS target is missing? - ---- CMakeLists.txt.orig 2021-10-14 15:22:02 UTC -+++ CMakeLists.txt -@@ -168,6 +168,12 @@ set_package_properties(XKB PROPERTIES - - find_package(Qt5XkbCommonSupport REQUIRED) - -+find_package(Threads) -+set_package_properties(Threads PROPERTIES -+ TYPE REQUIRED -+ PURPOSE "Required for building KWin with Wayland support" -+) -+ - find_package(Libinput 1.9) - set_package_properties(Libinput PROPERTIES TYPE REQUIRED PURPOSE "Required for input handling on Wayland.") - diff --git a/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h b/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h deleted file mode 100644 index 3e1ae351c4d3..000000000000 --- a/x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h +++ /dev/null @@ -1,18 +0,0 @@ -https://gitlab.com/kwinft/kwinft/-/issues/210 - -In file included from plugins/scenes/opengl/scene_opengl.cpp:30: -plugins/scenes/opengl/scene_opengl.h:93:10: error: no template named 'unordered_map' in namespace 'std' - std::unordered_map windows; - ~~~~~^ - ---- plugins/scenes/opengl/scene_opengl.h.orig 2021-06-08 12:27:49 UTC -+++ plugins/scenes/opengl/scene_opengl.h -@@ -30,6 +30,8 @@ along with this program. If not, see -+ - namespace KWin - { - class LanczosFilter;