From owner-dev-commits-ports-all@freebsd.org Sun Sep 5 18:21:11 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B5FF67F41D; Sun, 5 Sep 2021 18:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H2fx32f26z3HxJ; Sun, 5 Sep 2021 18:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B3197DED; Sun, 5 Sep 2021 18:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 185ILB2a035173; Sun, 5 Sep 2021 18:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 185ILBx3035172; Sun, 5 Sep 2021 18:21:11 GMT (envelope-from git) Date: Sun, 5 Sep 2021 18:21:11 GMT Message-Id: <202109051821.185ILBx3035172@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: faa54c832590 - main - x11-toolkits/qt5-gui: unbreak with libglvnd >= 1.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faa54c8325903424349630d2e80942ed881fb594 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Sep 2021 18:21:11 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=faa54c8325903424349630d2e80942ed881fb594 commit faa54c8325903424349630d2e80942ed881fb594 Author: Jan Beich AuthorDate: 2021-09-05 18:12:10 +0000 Commit: Jan Beich 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;",