commit: a2dfd665eeb527282c2bc51756b2881c134ce8b4 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Jun 21 01:00:40 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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 )
