summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5declarative
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5declarative')
-rw-r--r--package/qt5/qt5declarative/5.6.2/0001-examples-photoviewer-needs-widgets-support.patch (renamed from package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch)0
-rw-r--r--package/qt5/qt5declarative/5.6.2/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch (renamed from package/qt5/qt5declarative/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch)0
-rw-r--r--package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch37
-rw-r--r--package/qt5/qt5declarative/qt5declarative.hash4
4 files changed, 2 insertions, 39 deletions
diff --git a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch b/package/qt5/qt5declarative/5.6.2/0001-examples-photoviewer-needs-widgets-support.patch
index aeaaa91770..aeaaa91770 100644
--- a/package/qt5/qt5declarative/0001-examples-photoviewer-needs-widgets-support.patch
+++ b/package/qt5/qt5declarative/5.6.2/0001-examples-photoviewer-needs-widgets-support.patch
diff --git a/package/qt5/qt5declarative/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.2/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
index 875634fdb4..875634fdb4 100644
--- a/package/qt5/qt5declarative/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
+++ b/package/qt5/qt5declarative/5.6.2/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
diff --git a/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch b/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch
deleted file mode 100644
index 1d36b805f2..0000000000
--- a/package/qt5/qt5declarative/5.9.1/0001-Fix-alignment-issue-on-ARMv7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 03c2661b1243cc529fc3d8cfa65073f1da420307 Mon Sep 17 00:00:00 2001
-From: Simon Hausmann <simon.hausmann@qt.io>
-Date: Thu, 22 Jun 2017 13:34:09 +0200
-Subject: [PATCH 1/1] Fix alignment issue on ARMv7
-
-As analyzed in the bug report, it appears that we may get
-QV4::CompiledData::Function pointers for writing that are not aligned
-for the 64-bit fields at the beginning.
-
-[ChangeLog][QtQml] Fix crash due to misaligned data structures on ARMv7
-
-Task-number: QTBUG-61552
-Change-Id: I6b2c166b725496150c8850475577628ccd811d65
-Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
-commit: https://codereview.qt-project.org/#/c/198278/
-
-Signed-off-by: Petar Koretic <petar.koretic@qaap.io>
----
- src/qml/compiler/qv4compiler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
-index e32749bbf7..c32e1685a0 100644
---- a/src/qml/compiler/qv4compiler.cpp
-+++ b/src/qml/compiler/qv4compiler.cpp
-@@ -406,6 +406,8 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp
- *jsClassDataOffset = nextOffset;
- nextOffset += jsClassData.size();
-
-+ nextOffset = (nextOffset + 7) & ~quint32(0x7);
-+
- for (int i = 0; i < irModule->functions.size(); ++i) {
- QV4::IR::Function *f = irModule->functions.at(i);
- functionOffsets[i] = nextOffset;
---
-2.13.3
-
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index 31434cb2c1..59eae6f4fc 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,8 +1,8 @@
# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist
sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz
-# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz.mirrorlist
-sha256 d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff qtdeclarative-opensource-src-5.9.1.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz.mirrorlist
+sha256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 qtdeclarative-opensource-src-5.9.2.tar.xz
# Hashes for license files:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
OpenPOWER on IntegriCloud