diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-16 22:05:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-16 22:05:01 +0100 |
commit | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (patch) | |
tree | 125ee67bb9e0d548771cf7b61d04bb1f0dc57687 /kde-plasma/kwin/files | |
parent | 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (diff) |
gentoo resync : 16.09.2021
Diffstat (limited to 'kde-plasma/kwin/files')
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch | 25 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.22.5-32bit.patch | 29 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch | 44 |
3 files changed, 73 insertions, 25 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch deleted file mode 100644 index 08a472ad5561..000000000000 --- a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Tue, 6 Aug 2019 22:36:44 +0200 -Subject: [PATCH] Disable the effect video button if gstreamer is missing - ---- - kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml -index 71dbc5935..86ddf40b3 100644 ---- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml -+++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml -@@ -112,7 +112,7 @@ Kirigami.SwipeListItem { - } - actions: [ - Kirigami.Action { -- visible: model.VideoRole.toString() !== "" -+ visible: false - icon.name: "videoclip-amarok" - tooltip: i18nc("@info:tooltip", "Show/Hide Video") - onTriggered: videoItem.showHide() --- -2.22.0 - diff --git a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch new file mode 100644 index 000000000000..7c40b207ca86 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch @@ -0,0 +1,29 @@ +From 38e24ecd6416a975db0989c21b70d6a4cc242f35 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 15 Sep 2021 19:06:23 +0200 +Subject: [PATCH] Fix build with 32-bit + +Follow-up to 839710201c389b7f4ed248cb3818e755a37ce977 + +Tested-by: David Flogeras <dflogeras2@gmail.com> +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index d2900c7c3..c8acefe82 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -214,7 +214,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + } + + // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. +- unsigned long nativeWindow = window; ++ uintptr_t nativeWindow = window; + + EGLSurface surface = EGL_NO_SURFACE; + if (havePlatformBase()) { +-- +2.33.0 + diff --git a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch new file mode 100644 index 000000000000..bdca6e2081bc --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch @@ -0,0 +1,44 @@ +From 839710201c389b7f4ed248cb3818e755a37ce977 Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> +Date: Fri, 10 Sep 2021 13:36:04 +0300 +Subject: [PATCH] x11: Fix build with EGL_NO_PLATFORM_SPECIFIC_TYPES + +eglCreateWindowSurface() wants a Window (unsigned long), but with +EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an +opaque pointer, i.e. void*. + +BUG: 440372 +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index c62ec170d..d2900c7c3 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -213,15 +213,16 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + return EGL_NO_SURFACE; + } + ++ // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. ++ unsigned long nativeWindow = window; ++ + EGLSurface surface = EGL_NO_SURFACE; + if (havePlatformBase()) { +- // Note: Window is 64 bits on a 64-bit architecture whereas xcb_window_t is +- // always 32 bits. eglCreatePlatformWindowSurfaceEXT() expects the +- // native_window parameter to be pointer to a Window, so this variable +- // cannot be an xcb_window_t. +- surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr); ++ // eglCreatePlatformWindowSurfaceEXT() expects a pointer to the Window. ++ surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr); + } else { +- surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr); ++ // eglCreateWindowSurface() expects a Window, not a pointer to the Window. ++ surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast<EGLNativeWindowType>(nativeWindow), nullptr); + } + + return surface; +-- +GitLab + |