git: faa54c832590 - main - x11-toolkits/qt5-gui: unbreak with libglvnd >= 1.3.4

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=faa54c8325903424349630d2e80942ed881fb594

commit faa54c8325903424349630d2e80942ed881fb594
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-09-05 18:12:10 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-09-05 18:21:02 +0000

    x11-toolkits/qt5-gui: unbreak with libglvnd >= 1.3.4
    
    executing config test egl-x11
    [...]
    > main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_XDisplay *') with an rvalue of type 'EGLNativeDisplayType' (aka 'void *')
    >     Display *dpy = EGL_DEFAULT_DISPLAY;
    >              ^     ~~~~~~~~~~~~~~~~~~~
    [...]
    QPA backends:
      XCB:
        GL integrations:
          EGL-X11 Plugin ..................... no
    [...]
    ====> Checking for pkg-plist issues (check-plist)
    ===> Parsing plist
    ===> Checking for items in STAGEDIR missing from pkg-plist
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    Error: Missing: %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
    Error: Missing: %%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
    ===> Error: Plist issues found.
    *** Error code 1
    
    PR:             258269
    See also:       https://bugs.gentoo.org/810343
---
 x11-toolkits/qt5-gui/files/patch-src_gui_configure.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json b/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json
new file mode 100644
index 000000000000..bef635ebd78d
--- /dev/null
+++ b/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json
@@ -0,0 +1,16 @@
+Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971
+
+main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_XDisplay *') with an rvalue of type 'EGLNativeDisplayType' (aka 'void *')
+    Display *dpy = EGL_DEFAULT_DISPLAY;
+             ^     ~~~~~~~~~~~~~~~~~~~
+
+--- src/gui/configure.json.orig	2020-10-27 08:02:11 UTC
++++ src/gui/configure.json
+@@ -845,6 +845,7 @@
+                     "// window and pixmap types will be different than what an X-based platform",
+                     "// plugin would expect."
+                 ],
++                "head": [ "#define USE_X11" ],
+                 "include": [ "EGL/egl.h", "X11/Xlib.h" ],
+                 "main": [
+                     "Display *dpy = EGL_DEFAULT_DISPLAY;",