commit: 158283e34582c11958bd894a25d5cd04d9af93de Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jun 7 11:08:34 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Jun 7 11:17:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158283e3
Revert "dev-qt/qtwebengine: set CMAKE_QA_COMPAT_SKIP=1" On second thought, will set this in the eclass. Affects at least one more package (qtmultimedia), and unused or replaced CMakeLists.txt is a common trend in Qt and this may be volatile. If something breaks with cmake-4, would rather that it just breaks rather than do the =3.5 workaround and will fix it then. This reverts commit 73194358936565f89dcd99b29d74627cdbb99b0e. Bug: https://bugs.gentoo.org/957476 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 -- 6 files changed, 12 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild index bedf240f3a98..0ff90767d229 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild @@ -113,8 +113,6 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild index c514698e7b24..338cd40326a0 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild @@ -120,8 +120,6 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.8.3-gperf3.2.patch ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild index 7e8d1143ce7b..a9a10c6c4599 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild @@ -116,8 +116,6 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.9.0-QTBUG-133570.patch ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild index 5cbede2bb49a..5a2e9e46519a 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild @@ -113,8 +113,6 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.9.1-CVE-2025-5419.patch ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 2eb235614a28..ed3ad36a0177 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -112,8 +112,6 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.8.3-gperf3.2.patch ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 54909b2d56f2..6bb570e8a426 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -111,8 +111,6 @@ PATCHES+=( # add extras as needed here, may merge in set if carries across versions ) -CMAKE_QA_COMPAT_SKIP=1 # uses BUILD.gn over these CMakeLists.txt (bug #957476) - python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" }
