diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-10-08 14:16:47 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-10-08 14:18:48 -0400 |
| commit | b453f3146786c474326edb8764cf3a23f9ab7ebb (patch) | |
| tree | 2971884f1e331f635fb3b97494e66ed40388ad34 /dev-qt | |
| parent | net-libs/libmbim: enable py3.12, py3.13 for 1.26.4 (diff) | |
| download | gentoo-b453f3146786c474326edb8764cf3a23f9ab7ebb.tar.gz gentoo-b453f3146786c474326edb8764cf3a23f9ab7ebb.tar.bz2 gentoo-b453f3146786c474326edb8764cf3a23f9ab7ebb.zip | |
dev-qt/qtdeclarative: drop QTBUG-129797 patch for now
spectacle still fails but with a different error, "possibly"
caused by the patch itself if not a different issue.
Will give this more time to be investigated upstream and
drop it to be safe for now.
Sorry for quick succession revbumps (albeit 6.8.0 is masked
anyway).
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch | 19 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild (renamed from dev-qt/qtdeclarative/qtdeclarative-6.8.0-r1.ebuild) | 1 |
2 files changed, 0 insertions, 20 deletions
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 deleted file mode 100644 index 12c15ad1accd..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 -@@ -79,5 +79,5 @@ - + (m_jsUnitGenerator->hasStringId(elementName) - ? QString::number(m_jsUnitGenerator->getStringId(elementName)) -- : u'"' + elementName + u'"') + u")"_s; -+ : u"QStringLiteral(\"%1\")"_s.arg(elementName)); - } - -@@ -87,5 +87,5 @@ - + (m_jsUnitGenerator->hasStringId(elementName) - ? QString::number(m_jsUnitGenerator->getStringId(elementName)) -- : u'"' + elementName + u'"') + u")"_s; -+ : u"QStringLiteral(\"%1\")"_s.arg(elementName)); - } - diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild index 41fbd3c4f304..749123d1c04f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild @@ -35,7 +35,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch - "${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch ) src_configure() { |