summaryrefslogtreecommitdiff
path: root/x11-toolkits/qt6-declarative
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/qt6-declarative')
-rw-r--r--x11-toolkits/qt6-declarative/Makefile1
-rw-r--r--x11-toolkits/qt6-declarative/distinfo6
-rw-r--r--x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp33
3 files changed, 3 insertions, 37 deletions
diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile
index 7c94487156b3..bb9432d6a2fc 100644
--- a/x11-toolkits/qt6-declarative/Makefile
+++ b/x11-toolkits/qt6-declarative/Makefile
@@ -1,6 +1,5 @@
PORTNAME= declarative
DISTVERSION= ${QT6_VERSION}
-PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt6-
diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo
index adf53cb16309..41f47bf1a765 100644
--- a/x11-toolkits/qt6-declarative/distinfo
+++ b/x11-toolkits/qt6-declarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749158745
-SHA256 (KDE/Qt/6.9.1/qtdeclarative-everywhere-src-6.9.1.tar.xz) = ccb94665df0199d7ee387b965b29677c8b89cfb1782bb6f01239b1d1524cec97
-SIZE (KDE/Qt/6.9.1/qtdeclarative-everywhere-src-6.9.1.tar.xz) = 37006920
+TIMESTAMP = 1756198761
+SHA256 (KDE/Qt/6.9.2/qtdeclarative-everywhere-src-6.9.2.tar.xz) = 477f2d2c0bd98916107818725e6d498206e033dfb2859c52121e01a06ac42664
+SIZE (KDE/Qt/6.9.2/qtdeclarative-everywhere-src-6.9.2.tar.xz) = 37207872
diff --git a/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp b/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp
deleted file mode 100644
index 943fdf9f7134..000000000000
--- a/x11-toolkits/qt6-declarative/files/patch-src_qmlcompiler_qqmljsimportvisitor.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream patch for the qmlcompiler crash
-https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?h=6.9&id=672e6777e8e6a8fd86c7877075e7a8aa0ea0a31a
-
---- src/qmlcompiler/qqmljsimportvisitor.cpp.orig 2025-05-28 20:21:26 UTC
-+++ src/qmlcompiler/qqmljsimportvisitor.cpp
-@@ -1041,16 +1041,17 @@ void QQmlJSImportVisitor::checkRequiredProperties()
- : u"here"_s;
-
- 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);
- }