gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-05 14:07:27 -08:00
Code Issues Projects Releases Wiki Activity

dev-qt/qtdeclarative: backport fix for qmlcachegen crashes

Browse Source 
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens 2025-06-13 09:20:39 -04:00
parent 925a05683d
commit 91ab37ab13
No known key found for this signature in database
GPG Key ID: B24406B0B0AC4334
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dev-qt/qtdeclarative/files/qtdeclarative-6.9.1-qmlcachegen-crash.patch Normal file
View File

@ -0,0 +1,32 @@
https://bugreports.qt.io/browse/QTBUG-136998
https://bugreports.qt.io/browse/QTBUG-137196
https://bugreports.qt.io/browse/QTBUG-137411
https://github.com/qt/qtdeclarative/commit/672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a
--- a/src/qmlcompiler/qqmljsimportvisitor.cpp
+++ b/src/qmlcompiler/qqmljsimportvisitor.cpp
@@ -1042,14 +1042,15 @@
if (!prevRequiredScope.isNull()) {
- auto sourceScope = prevRequiredScope->baseType();
- suggestion = QQmlJSFixSuggestion{
- "%1:%2:%3: Property marked as required in %4."_L1
- .arg(sourceScope->filePath())
- .arg(sourceScope->sourceLocation().startLine)
- .arg(sourceScope->sourceLocation().startColumn)
- .arg(requiredScopeName),
- sourceScope->sourceLocation()
- };
- suggestion->setFilename(sourceScope->filePath());
+ if (auto sourceScope = prevRequiredScope->baseType()) {
+ suggestion = QQmlJSFixSuggestion{
+ "%1:%2:%3: Property marked as required in %4."_L1
+ .arg(sourceScope->filePath())
+ .arg(sourceScope->sourceLocation().startLine)
+ .arg(sourceScope->sourceLocation().startColumn)
+ .arg(requiredScopeName),
+ sourceScope->sourceLocation()
+ };
+ suggestion->setFilename(sourceScope->filePath());
+ }
} else {
message += " (marked as required by %1)"_L1.arg(requiredScopeName);

1
dev-qt/qtdeclarative/qtdeclarative-6.9.1-r1.ebuild → dev-qt/qtdeclarative/qtdeclarative-6.9.1-r2.ebuild
View File

@ -34,6 +34,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.9.1-QTBUG-135158.patch
"${FILESDIR}"/${PN}-6.9.1-qmlcachegen-crash.patch
)
src_configure() {