[neon/qt/qtbase/Neon/release] debian: Fix EGL X11 test.

[Lisandro Damián Nicanor Pérez Meyer]

Git commit 3a4c1392cda313e9deeeba18ed1c3ab9279b2684 by Lisandro Damián Nicanor Pérez Meyer.
Committed on 22/09/2021 at 20:20.
Pushed by jriddell into branch 'Neon/release'.

Fix EGL X11 test.

M  +2    -0    debian/changelog
A  +19   -0    debian/patches/cast_types_for_egl_x11_test.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/3a4c1392cda313e9deeeba18ed1c3ab9279b2684

diff --git a/debian/changelog b/debian/changelog
index 5b2b794..af487be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtbase-opensource-src (5.15.2+dfsg-12) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add a patch to properly cast types for EGL X11 tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 Sep 2021 16:54:46 -0300
 
diff --git a/debian/patches/cast_types_for_egl_x11_test.diff b/debian/patches/cast_types_for_egl_x11_test.diff
new file mode 100644
index 0000000..547ef00
--- /dev/null
+++ b/debian/patches/cast_types_for_egl_x11_test.diff
@@ -0,0 +1,19 @@
+Description: properly cast types for libglvnd 1.3.4
+Origin: https://src.fedoraproject.org/rpms/qt5-qtbase/blob/rawhide/f/qtbase-everywhere-src-5.15.2-libglvnd.patch
+Author: Rex Dieter <rdieter at gmail.com>
+
+diff -up qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd qtbase-everywhere-src-5.15.2/src/gui/configure.json
+--- qtbase-everywhere-src-5.15.2/src/gui/configure.json.libglvnd	2020-10-27 03:02:11.000000000 -0500
++++ qtbase-everywhere-src-5.15.2/src/gui/configure.json	2021-09-10 10:05:53.610312223 -0500
+@@ -847,9 +847,9 @@
+                 ],
+                 "include": [ "EGL/egl.h", "X11/Xlib.h" ],
+                 "main": [
+-                    "Display *dpy = EGL_DEFAULT_DISPLAY;",
++                    "Display *dpy = reinterpret_cast<Display *>(EGL_DEFAULT_DISPLAY);",
+                     "EGLNativeDisplayType egldpy = XOpenDisplay(\"\");",
+-                    "dpy = egldpy;",
++                    "dpy = reinterpret_cast<Display *>(egldpy);",
+                     "EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);",
+                     "XDestroyWindow(dpy, w);",
+                     "XCloseDisplay(dpy);"
diff --git a/debian/patches/series b/debian/patches/series
index 0a3370d..d1f97ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ qdoc_default_incdirs.diff
 path_max.diff
 qstorageinfo_linux.diff
 cross_build_mysql.diff
+cast_types_for_egl_x11_test.diff