gentoo auto-resync : 10:10:2024 - 04:03:57

4 files changed, 27 insertions, 63 deletions

diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 058e5b1d9f80..cc2ca5ed40a3 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,5 +1,6 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 AUX qtdeclarative-6.7.3-QTBUG-125053.patch 9583 BLAKE2B d7bdfe4d0a002e5d17f57604dbece3294596a76d03bc3c12a05622d2c95a16bde4bb128d19c63e4856270a875c5b6b866c9cfed9f30a346b441a2b81e7cdf2d1 SHA512 3811879d972ff5a0dbfca98c2c2931f50dd9906dc0ecf75f13e59eae71d9d27dfc9279ba9952a00be81cab83e8f8e42e798d9b43d7d3d6974a1676f4e8e401ea
+AUX qtdeclarative-6.8.0-QTBUG-129797.patch 1236 BLAKE2B edfa939f1438031c1a0b168dc493806d372f072d3b104975da56711c2ee2df402aba076ca7071576ed98a8bdb0668af2f7258c6d2a9f4ae68192473b1630fb39 SHA512 9cc280dccc08aa0bacd0d5ce34dbd1ab6cebf3bcc3cbe4854b03c1e12971619993845d9689b146cb89557c2dbe7b0a44870e6bb0cb1e1d6b4a89924a19b8be7d
 DIST qtdeclarative-5.15.14-gentoo-kde-1.tar.xz 26628 BLAKE2B 2b8302b96e5a8cae374da43dfaa5c5c7bf66ddfaa4fed055850fe7b39b995b1416268b94fb98fbc7074b6a0da47e8f9232751dba34b6021e095d7f9339fbfdd9 SHA512 3d4f3cc023e9da32105520bbe74847bb438ec3af85cf6203321400d451902071115ed3cc0c42e8cf995d0304f86cda11096223ad99b09a7dd95b3d83291a7b4a
 DIST qtdeclarative-everywhere-opensource-src-5.15.14.tar.xz 21595408 BLAKE2B c88388bd04636bc55cad17d97a9f3ee2d3bda6b585cad59d70106bd4e14bf37570bba5edc21627bc08852034adcb483b4c23d7f21ba523dc9e7b6c1f0386a994 SHA512 06c48938c5ab96c4a9e010fdf4a8fbf2b84b7669a486298044363048de3b7da01aa5d9284d1b08b563331887e326befb25566f9972f5143ca3cde47016394bbd
 DIST qtdeclarative-everywhere-src-6.7.2.tar.xz 35629324 BLAKE2B a2c5a17e2f88dd91dd7ae21950d8bb7bc0856f1f05a093405c68e1b3b584a75fee474a9a7116a1797c464e2ca92778ebec774d4afa5ac6eebb1022daabad8868 SHA512 ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf
@@ -8,8 +9,7 @@ DIST qtdeclarative-everywhere-src-6.8.0.tar.xz 37029068 BLAKE2B 272c673eb06ad28b
 EBUILD qtdeclarative-5.15.14.ebuild 1537 BLAKE2B 9515ce8d7c01fa8119ecc030871048dece2da2051a67cc1bf61907db5fb1ceeee7ca52503068a9059c3822df398d90e2fec630529a2f88a1ca707ac1c9ef9250 SHA512 d684a28aeda630154eb7c1023dbf231baf5cde528788cb3fbaab35e24a349dd585519aff99d44c405fc6f5f92e9f52d49f30cbbb11c908cf5f42e8d7f5826543
 EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358b664cc70013f269af95e72b353cfc0103d3953fa308532dfbd00ce0f703c33e341e8a829c1a6bb62a09c07ec8cb7910 SHA512 48af79fdeff33c7d2da696364e1dc1a6694d9a6428a8aae11c5bd2ad2046f7a82bb780824da9a1aef1741322680534cd0d261a50acf235ae3b4fb0f8346d7dc7
 EBUILD qtdeclarative-6.7.3-r2.ebuild 1798 BLAKE2B e08a04183d4de74c334058ed703c786ea1f82068707c80f1d009433fba9da289fd94759ba5c537a96d2cee8ebc838c9e2fdebda53246231cb80f4def98ac1a54 SHA512 7717d74451e24072b2fba8737a8ce4e546c3d600209d9d30e6277f3cc60f255a4306120084a21be63d817dc44e4e4866849bfa1128421985d4ca292a7b5ac180
-EBUILD qtdeclarative-6.7.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
-EBUILD qtdeclarative-6.8.0-r2.ebuild 1798 BLAKE2B e08a04183d4de74c334058ed703c786ea1f82068707c80f1d009433fba9da289fd94759ba5c537a96d2cee8ebc838c9e2fdebda53246231cb80f4def98ac1a54 SHA512 7717d74451e24072b2fba8737a8ce4e546c3d600209d9d30e6277f3cc60f255a4306120084a21be63d817dc44e4e4866849bfa1128421985d4ca292a7b5ac180
+EBUILD qtdeclarative-6.8.0-r3.ebuild 1844 BLAKE2B 7905155582401cc1915abcf7416928ed0da568548d3f56eebb2fc2dcae0c2fa0ae497640132ae8031bfda9e013c256e6dcc9940d683cc209c83c91f2e4785734 SHA512 9ea142da22eee98ca2d8e3d2f1056d9a5da20776b750cea5d6423a7bdc8e3dd68d662ded08e8d6c9d5e20104bbc98bd744484d90f3c6d8ff29ee14e558a0f404
 EBUILD qtdeclarative-6.8.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 EBUILD qtdeclarative-6.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35
 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch
new file mode 100644
index 000000000000..e43e65c992d6
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/941172
+https://bugs.kde.org/show_bug.cgi?id=494281
+https://bugreports.qt.io/browse/QTBUG-129797
+https://codereview.qt-project.org/c/qt/qtdeclarative/+/596457
+--- a/src/qmlcompiler/qqmljscodegenerator.cpp
++++ b/src/qmlcompiler/qqmljscodegenerator.cpp
+@@ -78,6 +78,6 @@
+     return u"QQmlPrivate::compositeListMetaType(aotContext->compilationUnit, "_s
+             + (m_jsUnitGenerator->hasStringId(elementName)
+-                       ? QString::number(m_jsUnitGenerator->getStringId(elementName))
+-                       : u'"' + elementName + u'"') + u")"_s;
++                       ? QString::number(m_jsUnitGenerator->getStringId(elementName)) + u')'
++                       : u"QStringLiteral(\"%1\"))"_s.arg(elementName));
+ }
+ 
+@@ -86,6 +86,6 @@
+     return u"QQmlPrivate::compositeMetaType(aotContext->compilationUnit, "_s
+             + (m_jsUnitGenerator->hasStringId(elementName)
+-                       ? QString::number(m_jsUnitGenerator->getStringId(elementName))
+-                       : u'"' + elementName + u'"') + u")"_s;
++                       ? QString::number(m_jsUnitGenerator->getStringId(elementName)) + u')'
++                       : u"QStringLiteral(\"%1\"))"_s.arg(elementName));
+ }
+ 
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
deleted file mode 100644
index 724f992b0453..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-# 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 ~sparc ~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
-"
-
-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
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild
index 749123d1c04f..41fbd3c4f304 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch
+	"${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch
 )
 
 src_configure() {