aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-11-12 13:57:41 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-11-12 14:44:46 +0000
commitb9d80a90cc2eb45b5a7ae0d5a0d1e60b1df8b68e (patch)
tree5066761e050c5d771801b6a392a7af5b06c36936
parent37b84b3d1536e44f88e0b57640ea57074cfcd159 (diff)
downloadports-b9d80a90cc2eb45b5a7ae0d5a0d1e60b1df8b68e.tar.gz
ports-b9d80a90cc2eb45b5a7ae0d5a0d1e60b1df8b68e.zip
x11-wm/kwinft: replace patches with upstream versions
-rw-r--r--x11-wm/kwinft/Makefile2
-rw-r--r--x11-wm/kwinft/distinfo4
-rw-r--r--x11-wm/kwinft/files/patch-CMakeLists.txt22
-rw-r--r--x11-wm/kwinft/files/patch-plugins_scenes_opengl_scene__opengl.h18
4 files changed, 6 insertions, 40 deletions
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
@@ -6,6 +6,8 @@ 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
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
@@ -5,3 +5,7 @@ SHA256 (4d47897f7cc5.patch) = 253a4822219f587b567812262de99fac781e440353847c21e4
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<uint32_t, OpenGLWindow*> 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 <http://www.gnu.
- #include "decorations/decorationrenderer.h"
- #include "platformsupport/scenes/opengl/backend.h"
-
-+#include <unordered_map>
-+
- namespace KWin
- {
- class LanczosFilter;