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 360A115817D for ; Fri, 21 Jun 2024 01:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45221E2A73; Fri, 21 Jun 2024 01:10:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DC3B7E2A73 for ; Fri, 21 Jun 2024 01:10:17 +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 B629A33BE19 for ; Fri, 21 Jun 2024 01:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 142231D0E for ; Fri, 21 Jun 2024 01:10:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1718931825.a2dfd665eeb527282c2bc51756b2881c134ce8b4.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild dev-qt/qtwebengine/qtwebengine-6.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: a2dfd665eeb527282c2bc51756b2881c134ce8b4 X-VCS-Branch: master Date: Fri, 21 Jun 2024 01:10:15 +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: 1775aae2-a8ec-460c-bcd5-2d203407a4ce X-Archives-Hash: a3de07d8f9d472290536d41757971123 commit: a2dfd665eeb527282c2bc51756b2881c134ce8b4 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jun 21 01:00:40 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jun 21 01:03:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2dfd665 dev-qt/qtwebengine: alternate fix for USE="pdfium -pulseaudio" (qt6) Just realized the issue is self-inflicted. The pkg-config check is done only if "use_pulseaudio && link_pulseaudio" and the latter is passed by us rather than Qt. It seemed harmless to be unconditional given the main switch disabled it (which technically sounds better), but given it doesn't for pdfium let's change that and do it for pipewire as well while at it. Bug: https://bugs.gentoo.org/934635 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 6 ++---- dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 6 ++---- dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 6 ++---- dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 6 ++---- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 ++---- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild index 9a079c75fbdb..5a2f200aba85 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild @@ -221,11 +221,9 @@ src_configure() { ) local mygnargs=( - # prevent pdfium from looking for it if disabled (bug #934635) - use_pulseaudio=$(usex pulseaudio true false) # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) # reduce default disk space usage symbol_level=0 ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild index 196438e3994d..3726d7743a00 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild @@ -221,11 +221,9 @@ src_configure() { ) local mygnargs=( - # prevent pdfium from looking for it if disabled (bug #934635) - use_pulseaudio=$(usex pulseaudio true false) # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) # reduce default disk space usage symbol_level=0 ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index 196438e3994d..3726d7743a00 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -221,11 +221,9 @@ src_configure() { ) local mygnargs=( - # prevent pdfium from looking for it if disabled (bug #934635) - use_pulseaudio=$(usex pulseaudio true false) # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) # reduce default disk space usage symbol_level=0 ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 700b65e1e2c1..16c70f30d158 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -221,11 +221,9 @@ src_configure() { ) local mygnargs=( - # prevent pdfium from looking for it if disabled (bug #934635) - use_pulseaudio=$(usex pulseaudio true false) # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) # reduce default disk space usage symbol_level=0 ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 700b65e1e2c1..16c70f30d158 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -221,11 +221,9 @@ src_configure() { ) local mygnargs=( - # prevent pdfium from looking for it if disabled (bug #934635) - use_pulseaudio=$(usex pulseaudio true false) # prefer no dlopen where possible - link_pulseaudio=true - rtc_link_pipewire=true + $(usev pulseaudio link_pulseaudio=true) + $(usev screencast rtc_link_pipewire=true) # reduce default disk space usage symbol_level=0 )