[neon/kde/kwin/Neon/unstable] debian/patches: test https://invent.kde.org/plasma/kwin/-/merge_requests/1446https://invent.kde.org/plasma/kwin/-/merge_requests/1446

Jonathan Riddell null at kde.org
Tue Sep 21 15:49:05 BST 2021


Git commit 0c4c11a0dc0f0496beb04a48aafd9a0935af7b72 by Jonathan Riddell.
Committed on 21/09/2021 at 14:49.
Pushed by jriddell into branch 'Neon/unstable'.

test https://invent.kde.org/plasma/kwin/-/merge_requests/1446https://invent.kde.org/plasma/kwin/-/merge_requests/1446

M  +1    -0    debian/patches/series
A  +17   -0    debian/patches/x11-c-style-cast-egl-native-window

https://invent.kde.org/neon/kde/kwin/commit/0c4c11a0dc0f0496beb04a48aafd9a0935af7b72

diff --git a/debian/patches/series b/debian/patches/series
index c6fa3b0..33cb13c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Disable-testShadeWobblyWindows.patch
 disable-MouseMark-and-TrackMouse-effects-loading-test.patch
+x11-c-style-cast-egl-native-window
diff --git a/debian/patches/x11-c-style-cast-egl-native-window b/debian/patches/x11-c-style-cast-egl-native-window
new file mode 100644
index 0000000..c22f808
--- /dev/null
+++ b/debian/patches/x11-c-style-cast-egl-native-window
@@ -0,0 +1,17 @@
+diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
+index 3c4e684f7..32b7c038f 100644
+--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
+@@ -221,10 +221,8 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
+         // eglCreatePlatformWindowSurfaceEXT() expects a pointer to the Window.
+         surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr);
+     } else {
+-        // eglCreateWindowSurface() expects a Window, not a pointer to the Window. Don't
+-        // use reinterpret_cast<>() as there are platforms where the size of the Window is
+-        // not the same as the size of EGLNativeWindowType.
+-        surface = eglCreateWindowSurface(eglDisplay(), config(), (EGLNativeWindowType) nativeWindow, nullptr);
++        // eglCreateWindowSurface() expects a Window, not a pointer to the Window.
++        surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast<EGLNativeWindowType>(nativeWindow), nullptr);
+     }
+ 
+     return surface;


More information about the Neon-commits mailing list