git: 934e8c6541b2 - main - x11-toolkits/qt5-gui: minimal plugin independent of option X11

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Tue, 06 Dec 2022 18:12:52 UTC
The branch main has been updated by adridg:

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

commit 934e8c6541b2c9233e2df5901d466ce8fc23e668
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2022-12-06 14:08:19 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2022-12-06 18:12:10 +0000

    x11-toolkits/qt5-gui: minimal plugin independent of option X11
    
    The "minimal" plugin is always needed (or just **one** of
    the plugins, but this will do) to allow QtGui applications
    to function. Turning off X11 turned them all off (I supposed
    "if you're not using X11, you must install the Wayland bits
    instead" would work, but that's hard to express in ports).
    
    So remove the plist-sub from the minimal plugin -- there is
    enough X11 pulled in regardless of the X11 option, that
    the plugin builds (and links against X11 libraries, so
    the option is a lie).
    
    The linked PR is not for this port, but demonstrates a problem:
    if X11 is turned off, there is no platform plugins at all,
    and then there is no way to run Qt-Gui applications (even with
    minimal / no graphics). For "command-line" Qt-Gui applications
    like qhelpgenerator, that is a problem.
    
    PR:             267949
---
 x11-toolkits/qt5-gui/Makefile  | 1 +
 x11-toolkits/qt5-gui/pkg-plist | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index b88214695abf..e035155aa120 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gui
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits graphics
 PKGNAMEPREFIX=	qt5-
 
diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist
index 60640c46dee6..1632adf7821a 100644
--- a/x11-toolkits/qt5-gui/pkg-plist
+++ b/x11-toolkits/qt5-gui/pkg-plist
@@ -948,8 +948,8 @@
 %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libibusplatforminputcontextplugin.so.debug
 %%X11%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so
 %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqbsdfb.so.debug
-%%X11%%%%QT_PLUGINDIR%%/platforms/libqminimal.so
-%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqminimal.so.debug
+%%QT_PLUGINDIR%%/platforms/libqminimal.so
+%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqminimal.so.debug
 %%X11%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so
 %%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so.debug
 %%X11%%%%QT_PLUGINDIR%%/platforms/libqvnc.so