commit: 19949431674e80b0a9eae2f782b4ab64abc2d9c6 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Jun 7 11:04:59 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=19949431
Revert "dev-qt/qtdeclarative: 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 51c2217d6c13c8009c08b3b9de46ff3491e792be. Bug: https://bugs.gentoo.org/957475 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.8.2.ebuild | 2 -- dev-qt/qtdeclarative/qtdeclarative-6.8.3.ebuild | 2 -- dev-qt/qtdeclarative/qtdeclarative-6.9.0.ebuild | 2 -- dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild | 2 -- dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild | 2 -- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 2 -- 6 files changed, 12 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.2.ebuild index eaae2899f649..adeb87ce486e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.8.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.2.ebuild @@ -33,8 +33,6 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.3.ebuild index 18cc5653d10d..dfc119d8b04a 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.8.3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.3.ebuild @@ -33,8 +33,6 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.0.ebuild index 6b2c8744182f..b38935f84f17 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9.0.ebuild @@ -33,8 +33,6 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild index 4ecb7a8450ac..2b9c1ea26d3e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild @@ -36,8 +36,6 @@ PATCHES=( "${FILESDIR}"/${PN}-6.9.1-QTBUG-135158.patch ) -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild index 0378a78d5b93..d9c1d4f601aa 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9.9999.ebuild @@ -32,8 +32,6 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 0378a78d5b93..d9c1d4f601aa 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -32,8 +32,6 @@ BDEPEND=" ~dev-qt/qtshadertools-${PV}:6 " -CMAKE_QA_COMPAT_SKIP=1 # unused doc/snippets CMakeLists.txt (bug #957475) - src_configure() { local mycmakeargs=( $(cmake_use_find_package qmlls Qt6LanguageServerPrivate)
