commit: 0f87690bf7284775cc0d44775a7d1fc1a8751921 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Oct 10 01:11:38 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Oct 10 01:27:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f87690b
dev-qt/qtdeclarative: backport fix for QTBUG-129797 take two Closes: https://bugs.gentoo.org/941172 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/qtdeclarative-6.8.0-QTBUG-129797.patch | 24 ++++++++++++++++++++++ ...8.0-r2.ebuild => qtdeclarative-6.8.0-r3.ebuild} | 1 + 2 files changed, 25 insertions(+) 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.8.0-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild similarity index 97% rename from dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild rename to 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() {
