diff options
author | 2021-12-13 14:57:26 +0100 | |
---|---|---|
committer | 2021-12-14 10:22:49 +0100 | |
commit | 1da8ab836aaa3a850454a0d32d3251a82fee23cc (patch) | |
tree | 6997f08c755253550b09e06e10b148d20d4b1597 /kde-plasma/kwin/files | |
parent | kde-plasma/kwayland-server: drop 5.22.5* (diff) | |
download | gentoo-1da8ab836aaa3a850454a0d32d3251a82fee23cc.tar.gz gentoo-1da8ab836aaa3a850454a0d32d3251a82fee23cc.tar.bz2 gentoo-1da8ab836aaa3a850454a0d32d3251a82fee23cc.zip |
kde-plasma/kwin: drop 5.22.5*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/kwin/files')
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch | 63 |
1 files changed, 0 insertions, 63 deletions
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 deleted file mode 100644 index d185d5e41fe6..000000000000 --- a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch +++ /dev/null @@ -1,63 +0,0 @@ -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 - -* asturm 2021-09-21: Merged with upstream commits: -38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit" -e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms" - -* asturm 2021-10-04: Merged with upstream commit: -From df11acd46778e1e43183c2660bc9dcb1a8ad3282 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Tue, 21 Sep 2021 17:34:59 +0300 -Subject: [PATCH] x11: Cast Window to EGLNativeWindowType using a C cast - -reinterpret_cast<>() will fail if the types we cast from and to have -mismatching sizes. - -Unfortunately, there are platforms that have Window and -EGLNativeWindowType of different size. This results in compilation -errors. - -In order to work around those problematic platforms, this change -replaces reinterpret_cast cast with a c style cast. ---- - src/plugins/platforms/x11/common/eglonxbackend.cpp | 16 +++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff -u a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp ---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp -+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp -@@ -213,15 +213,19 @@ - return EGL_NO_SURFACE; - } - -+ // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. -+ Window 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. Use -+ // a c style cast as there are (buggy) platforms where the size of the Window -+ // type is not the same as the size of EGLNativeWindowType, reinterpret_cast<>() -+ // may not compile. -+ surface = eglCreateWindowSurface(eglDisplay(), config(), (EGLNativeWindowType) nativeWindow, nullptr); - } - - return surface; |