commit: e0b0e57cb2e768b12b40c79feb7a603848ab8d34
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 00:50:11 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 00:51:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b0e57c
dev-qt/qtwebengine: fix live builds with USE=-pdfium
Seems to be lacking some guards against the other options,
but it doesn't really make sense for the ebuild to rely on
these and should just not pass when the main switch is off.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index e76cbf965cca..5201c2915e1f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -170,13 +170,13 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
+ $(use pdfium && qt_feature qml qtpdf_quick_build)
+ $(use pdfium && qt_feature widgets qtpdf_widgets_build)
$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature webdriver webenginedriver)
$(qt_feature widgets qtwebengine_widgets_build)
$(cmake_use_find_package designer Qt6Designer)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
index 63706308a595..1a6a21048d46 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
@@ -165,9 +165,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
+ $(use pdfium && qt_feature qml qtpdf_quick_build)
+ $(use pdfium && qt_feature widgets qtpdf_widgets_build)
$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
# TODO?: since 6.9.0, dependency checks have been adjusted to
make it
@@ -176,6 +175,7 @@ src_configure() {
# on qtwebengine[webengine(+)]
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature webdriver webenginedriver)
$(qt_feature widgets qtwebengine_widgets_build)
$(cmake_use_find_package designer Qt6Designer)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 1b875f6f7354..1808541fc80c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -164,9 +164,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
+ $(use pdfium && qt_feature qml qtpdf_quick_build)
+ $(use pdfium && qt_feature widgets qtpdf_widgets_build)
$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
# TODO?: since 6.9.0, dependency checks have been adjusted to
make it
@@ -175,6 +174,7 @@ src_configure() {
# on qtwebengine[webengine(+)]
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature webdriver webenginedriver)
$(qt_feature widgets qtwebengine_widgets_build)
$(cmake_use_find_package designer Qt6Designer)
