From 02fe6d3863e456015e7fd103ec85ad25d01995b4 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Tue, 21 Jul 2026 12:13:51 -0400 Subject: [PATCH] dev-qt/qtdeclarative: drop 6.10.3-r1 Signed-off-by: Ionen Wolkens --- dev-qt/qtdeclarative/Manifest | 1 - .../qtdeclarative-6.10.3-QTBUG-144701.patch | 22 ------- .../qtdeclarative-6.10.3-unity-build.patch | 17 ----- .../qtdeclarative-6.10.3-r1.ebuild | 65 ------------------- 4 files changed, 105 deletions(-) delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-unity-build.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-6.10.3-r1.ebuild diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index ab7620ffd1a62..b9b9e5064fa2d 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,2 +1 @@ -DIST qtdeclarative-everywhere-src-6.10.3.tar.xz 38084496 BLAKE2B acefeb2f998001cd811d4ca62799cb44ed57e743a1198f58fe4d84f920b438496e45bf2cd71d08da83cf566bde09c4b2c284fb655bbcc607fd1c29d4c1c9a809 SHA512 187a525b73595e7c4d89c98be657df4f480114957649813aa9ecd3fba23f56f20c8804f2ab507d83a5fb6120a2c6c36751fe5c80f43f9feb6c3479a733fb6684 DIST qtdeclarative-everywhere-src-6.11.1.tar.xz 38744644 BLAKE2B ea428a3930276dbf4db912f905aa885971de13f4b35034b6819c93af938d1d36d6b0cc13c3e54c1cd7bb8c375e4744bdd98af1ea9105ced5ad982e6aa550357a SHA512 91d657a33b3bf8fc79f1116561f125b3905b590e94504dcb3e4feead71f209b35b42a9da783d4568f756b22fd7a0e9802e1a9039553d400fe33417562776a1d6 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch deleted file mode 100644 index c3ce88d065ef1..0000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-QTBUG-144701.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/973374 -https://codereview.qt-project.org/c/qt%2Fqtdeclarative/+/733089 ---- a/src/qml/qml/qqmltypecompiler.cpp -+++ b/src/qml/qml/qqmltypecompiler.cpp -@@ -919,12 +919,11 @@ - // Apply the ordering in the IR - obj->setFirstAlias(ordered[0]); -- if (ordered[0] == defaultPropertyAlias) -- obj->indexOfDefaultPropertyOrAlias = 0; -- for (qsizetype i = 0, end = ordered.size() - 1; i < end; ++i) { -+ for (qsizetype i = 0, end = ordered.size() - 1; i < end; ++i) - ordered[i]->next = ordered[i + 1]; -- if (ordered[i] == defaultPropertyAlias) -- obj->indexOfDefaultPropertyOrAlias = i; -- } - ordered.last()->next = nullptr; -+ if (defaultPropertyAlias) { -+ auto it = std::find(ordered.constBegin(), ordered.constEnd(), defaultPropertyAlias); -+ obj->indexOfDefaultPropertyOrAlias = std::distance(ordered.constBegin(), it); -+ } - - return true; diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-unity-build.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-unity-build.patch deleted file mode 100644 index 35eac524d8547..0000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.10.3-unity-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://codereview.qt-project.org/c/qt/qtdeclarative/+/723105 ---- a/src/qmlcompiler/qqmlsa.cpp -+++ b/src/qmlcompiler/qqmlsa.cpp -@@ -1379,5 +1379,5 @@ - QQmlJSScopesById::MostLikelyCallback result; - PassManagerPrivate::visitor(*d->m_manager)->addressableScopes().possibleScopes( -- id.toString(), QQmlJSScope::scope(context), Default, result); -+ id.toString(), QQmlJSScope::scope(context), QQmlJSScopesByIdOption::Default, result); - return QQmlJSScope::createQQmlSAElement(result.result); - } -@@ -1391,5 +1391,5 @@ - QQmlJSScopesById::MostLikelyCallback result; - PassManagerPrivate::visitor(*d->m_manager)->addressableScopes().possibleIds( -- QQmlJSScope::scope(element), QQmlJSScope::scope(context), Default, result); -+ QQmlJSScope::scope(element), QQmlJSScope::scope(context), QQmlJSScopesByIdOption::Default, result); - return result.result; - } diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.10.3-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.10.3-r1.ebuild deleted file mode 100644 index b34188abde478..0000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.10.3-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2021-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -QT6_HAS_STATIC_LIBS=1 -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -QT6_RESTRICT_TESTS=1 -inherit python-any-r1 qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" -fi - -IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] - qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) - svg? ( ~dev-qt/qtsvg-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - ~dev-qt/qtshadertools-${PV}:6 -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.10.3-unity-build.patch - "${FILESDIR}"/${PN}-6.10.3-QTBUG-144701.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) - $(cmake_use_find_package sql Qt6Sql) - $(cmake_use_find_package svg Qt6Svg) - $(qt_feature jit qml_jit) - $(qt_feature network qml_network) - $(qt_feature ssl qml_ssl) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675 - eerror "${CATEGORY}/${PF} seems to have been improperly built and" - eerror "install was aborted to protect the system. Possibly(?) due" - eerror "to a rare portage ordering bug. If using portage, try:" - eerror " emerge -1 qtshadertools:6 qtdeclarative:6" - eerror "If that did not resolve the issue, please provide build.log" - eerror "on https://bugs.gentoo.org/940675" - die "aborting due to incomplete/broken build (see above)" - fi -}