[neon/kde/kwin/Neon/unstable] debian/patches: remove patch now in branch
Jonathan Riddell
null at kde.org
Mon Sep 27 15:29:17 BST 2021
Git commit f6b662cb272b8d03caa537f31bb152b1937f7e9d by Jonathan Riddell.
Committed on 27/09/2021 at 14:29.
Pushed by jriddell into branch 'Neon/unstable'.
remove patch now in branch
M +0 -1 debian/patches/series
D +0 -17 debian/patches/x11-c-style-cast-egl-native-window
https://invent.kde.org/neon/kde/kwin/commit/f6b662cb272b8d03caa537f31bb152b1937f7e9d
diff --git a/debian/patches/series b/debian/patches/series
index 33cb13c..c6fa3b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
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
deleted file mode 100644
index 082eb0d..0000000
--- a/debian/patches/x11-c-style-cast-egl-native-window
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-index 32b7c038f..3c4e684f7 100644
---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
-+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -221,8 +221,10 @@ 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.
-- surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast<EGLNativeWindowType>(nativeWindow), nullptr);
-+ // 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);
- }
-
- return surface;
More information about the Neon-commits
mailing list