From nobody Tue Dec 06 18:12:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NRT6Y0FkLz4jYvS; Tue, 6 Dec 2022 18:12:53 +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 4NRT6X6wvKz4M2k; Tue, 6 Dec 2022 18:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670350373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JgJKD7da88H0NWidAFEVRPcZ/ErU69RvPLsdNzL2aZs=; b=Y3i4Ja9JukKFft7k+BfZ72NUtIpmz6QWT5D50LtadHG7EjkdCaGe5w6GvXq80f/ZxzHu7E AYXu5Bk+VTjs1hZOAZgWGsYH0draoidCdMUG7w6Epuu1FGIIriguU69ce/QCexunngeqDe CAnj358dcM9s1s33jdXebr/WM01AP/YG6khfU0BUdtbt5IIwriQedqYfIzcqxwoL84aq3R ACF499ybSsy1MyJAEWkZC2f6rRXOOSU/penkDctL/n7aWPJPY8uCF9/tFaIRiyda24nsl1 TLEfed+pPgvt0CNqDG6ElFI3icYF9aYU9yowZLibGUp5+3zSUHBWaUIotnJGfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670350373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JgJKD7da88H0NWidAFEVRPcZ/ErU69RvPLsdNzL2aZs=; b=eIqPzj/oW8Tpt+hgLO20mPql2w9jwpZ8ttRaMReG+Tg37+GtUGQ+sa31aac4fM/HTh5nmI KJlW/yex4S2wkbHkXI2bGjQysuuURyavlWNKKZwZxflpQhtBYsJtW0JdRUk60EAVZYlASY stw1y+/xd5yY1AmweHrih8Eotlj3bLPsEDNgAA0wWR/0trYz2FfHNZyRH10GFxAWOO5pQJ qApOuPRX1O4usVyp7wnLcB3wYtn07H+3APSErf5WeHOpCOQ3agUKpDjo/CNnwUxp6yT+0n V6Ulo5RpbIso5JGvhAt2a4pJUZHmh3mEKvTzMyZS5nUnMUEw5KMpuPt11ZUIBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670350373; a=rsa-sha256; cv=none; b=bStexcdhJI7RncxUSQ35CShbvquOHJ9r/0cgzTR2HilUwoXBv+aJaPSOBFCZNrd+bPiOOj r/dm1p18WU/SmET1Do2yFxHbD6Tc7DruKpzJtS8SSzHQohVGv2qQe8RtDp2QphYKuFWY/K gJUGOfwNsngYGyjIIzDU+U2qxNg55Nr/E50RV02IJ+plEZKQ3iRn7V4VQ5kBYSa3FBgM/U OI+6SIl+RbPZxxtjxSIWEBMg3Hzw0ZV0i5reHeNIb/KlIPUGGIe3NRhVyRMRss7TWUR7nh vyKXdrV2TLiYKsplCFq+RiLAysTTXtgV/6b5cCeH2knMmU4u7M5cfHWeIywegg== 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 4NRT6X60HBzmrh; Tue, 6 Dec 2022 18:12:52 +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 2B6ICq9A032771; Tue, 6 Dec 2022 18:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6ICqY3032770; Tue, 6 Dec 2022 18:12:52 GMT (envelope-from git) Date: Tue, 6 Dec 2022 18:12:52 GMT Message-Id: <202212061812.2B6ICqY3032770@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 934e8c6541b2 - main - x11-toolkits/qt5-gui: minimal plugin independent of option X11 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 934e8c6541b2c9233e2df5901d466ce8fc23e668 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=934e8c6541b2c9233e2df5901d466ce8fc23e668 commit 934e8c6541b2c9233e2df5901d466ce8fc23e668 Author: Adriaan de Groot AuthorDate: 2022-12-06 14:08:19 +0000 Commit: Adriaan de Groot 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