From 053a8742a188f716b69d16db71efb887a49474ce Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 10 Sep 2021 08:53:56 -0500
Subject: [PATCH] pull in proposed libglvnd-1.3.4 FTBFS fix (kde#440372,
 rh#2002431)

---
 ...-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch | 30 +++++++++++++++++++
 kwin.spec                                     |  6 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch

diff --git a/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch b/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch
new file mode 100644
index 0000000..4c0a435
--- /dev/null
+++ b/0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch
@@ -0,0 +1,30 @@
+From b6b310d0168b210d0dd3b3703d570b5f8b3d1dfb 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/xcb_window_t, 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 | 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 c62ec170d..da4c27c8e 100644
+--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
+@@ -221,7 +221,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
+         //       cannot be an xcb_window_t.
+         surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &window, nullptr);
+     } else {
+-        surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
++        surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast<EGLNativeWindowType>(window), nullptr);
+     }
+ 
+     return surface;
+-- 
+2.31.1
+
diff --git a/kwin.spec b/kwin.spec
index 017315d..4a7e524 100644
--- a/kwin.spec
+++ b/kwin.spec
@@ -39,6 +39,8 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
 ## upstream patches
 
 ## proposed patches
+# https://invent.kde.org/plasma/kwin/-/merge_requests/1404
+Patch100: 0001-x11-Fix-build-with-EGL_NO_PLATFORM_SPECIFIC_TYPES.patch
 
 # Base
 BuildRequires:  extra-cmake-modules
@@ -361,8 +363,8 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 
 
 %changelog
-* Wed Sep 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.22.5-2
-- rebuild
+* Fri Sep 10 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.22.5-2
+- pull in proposed libglvnd-1.3.4 FTBFS fix (kde#440372, rh#2002431)
 
 * Tue Aug 31 2021 Jan Grulich <jgrulich@redhat.com> - 5.22.5-1
 - 5.22.5