From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65D551581FB for ; Sun, 25 Aug 2024 20:27:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43C6BE2A66; Sun, 25 Aug 2024 20:27:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 279C6E2A66 for ; Sun, 25 Aug 2024 20:27:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24FA8342FFE for ; Sun, 25 Aug 2024 20:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 576821F0E for ; Sun, 25 Aug 2024 20:27:30 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1724617403.45a465608ea72d3de1aa22b6d250873251751aeb.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/qtbase-6.7.2-r3.ebuild dev-qt/qtbase/qtbase-6.7.2-r4.ebuild dev-qt/qtbase/qtbase-6.7.9999.ebuild dev-qt/qtbase/qtbase-6.8.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 45a465608ea72d3de1aa22b6d250873251751aeb X-VCS-Branch: master Date: Sun, 25 Aug 2024 20:27:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fb696ba-570d-43bf-9074-9a9cf484a32a X-Archives-Hash: cf673ed556293860a1039f510f16b19e commit: 45a465608ea72d3de1aa22b6d250873251751aeb Author: Eli Schwartz gentoo org> AuthorDate: Sun Aug 25 06:30:56 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Sun Aug 25 20:23:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a46560 dev-qt/qtbase: prevent automagically building against gtk[X,wayland] e.g. the upstream code checks whether GDK_WINDOWING_WAYLAND is defined by the gtk headers, and if so will compile against the wayland symbols it provides. This means that qtbase built on a system with gtk+[-wayland] will be compatible with anything, but when built on a system with gtk+[wayland], requires that at runtime. It's only needed, of course, by the qgtk3 platformtheme plugin which not necessarily everyone builds, wants, or uses at runtime :) but still. We can solve this with a (new) gentoo-specific macro that hides the GTK implementations when we don't want it. This is gated on our existing USE flags for wayland/X support. Signed-off-by: Eli Schwartz gentoo.org> .../qtbase/{qtbase-6.7.2-r3.ebuild => qtbase-6.7.2-r4.ebuild} | 11 +++++++++-- dev-qt/qtbase/qtbase-6.7.9999.ebuild | 11 +++++++++-- dev-qt/qtbase/qtbase-6.8.9999.ebuild | 11 +++++++++-- dev-qt/qtbase/qtbase-6.9999.ebuild | 11 +++++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild similarity index 96% rename from dev-qt/qtbase/qtbase-6.7.2-r3.ebuild rename to dev-qt/qtbase/qtbase-6.7.2-r4.ebuild index 2782f8186d06..e7e909a26a94 100644 --- a/dev-qt/qtbase/qtbase-6.7.2-r3.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.2-r4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build toolchain-funcs +inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -99,7 +99,7 @@ COMMON_DEPEND=" cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] x11-libs/pango ) ) @@ -170,6 +170,13 @@ src_prepare() { } src_configure() { + # The only component that uses gdk backends is the qgtk3 platformtheme plugin + if use gtk; then + # defang automagic dependencies + use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 + fi + local mycmakeargs=( -DBUILD_WITH_PCH=OFF diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index e4a66f7137f8..580f9e80474a 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build toolchain-funcs +inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -99,7 +99,7 @@ COMMON_DEPEND=" cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] x11-libs/pango ) ) @@ -166,6 +166,13 @@ src_prepare() { } src_configure() { + # The only component that uses gdk backends is the qgtk3 platformtheme plugin + if use gtk; then + # defang automagic dependencies + use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 + fi + local mycmakeargs=( -DBUILD_WITH_PCH=OFF diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index 9af015d9b088..1381d70d7a19 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build toolchain-funcs +inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -99,7 +99,7 @@ COMMON_DEPEND=" cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] x11-libs/pango ) ) @@ -166,6 +166,13 @@ src_prepare() { } src_configure() { + # The only component that uses gdk backends is the qgtk3 platformtheme plugin + if use gtk; then + # defang automagic dependencies + use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 + fi + local mycmakeargs=( -DBUILD_WITH_PCH=OFF diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 9af015d9b088..1381d70d7a19 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit qt6-build toolchain-funcs +inherit flag-o-matic qt6-build toolchain-funcs DESCRIPTION="Cross-platform application development framework" @@ -99,7 +99,7 @@ COMMON_DEPEND=" cups? ( net-print/cups ) gtk? ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] x11-libs/pango ) ) @@ -166,6 +166,13 @@ src_prepare() { } src_configure() { + # The only component that uses gdk backends is the qgtk3 platformtheme plugin + if use gtk; then + # defang automagic dependencies + use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 + fi + local mycmakeargs=( -DBUILD_WITH_PCH=OFF