[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-2-3-gef3a224
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Jul 1 09:24:27 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=ef3a224
The following commit has been merged in the experimental branch:
commit ef3a224c35fffb01c45585cd672297a334e7af21
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Jul 1 12:24:11 2017 +0300
Update patches for 5.9.1 release.
---
debian/changelog | 2 +
...make-lack-of-SSE2-support-on-x86-32-fatal.patch | 2 +-
debian/patches/big_endian.patch | 98 ----------------------
debian/patches/disableopengltests.patch | 4 +-
debian/patches/fix_test_remove_qlibraryinfo.patch | 2 +-
debian/patches/series | 1 -
6 files changed, 6 insertions(+), 103 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6ae6f2f..4590d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtdeclarative-opensource-src (5.9.1-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Update symbols files from buildds’ logs.
+ * Drop big_endian.patch, applied upstream.
+ * Refresh other patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 01 Jul 2017 12:12:29 +0300
diff --git a/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch b/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
index 9c300aa..ab72c85 100644
--- a/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
+++ b/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
@@ -72,7 +72,7 @@ Bug-Debian: https://bugs.debian.org/792594
protected IR::IRDecoder,
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -165,6 +165,7 @@ ExecutionEngine::ExecutionEngine(EvalISe
+@@ -163,6 +163,7 @@
#ifdef V4_ENABLE_JIT
static const bool forceMoth = !qEnvironmentVariableIsEmpty("QV4_FORCE_INTERPRETER") ||
diff --git a/debian/patches/big_endian.patch b/debian/patches/big_endian.patch
deleted file mode 100644
index ca8a8b2..0000000
--- a/debian/patches/big_endian.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: fix QML compiler crashes on big endian systems
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: https://codereview.qt-project.org/197746
-Last-Update: 2017-06-17
-
---- a/src/qml/compiler/qqmlirbuilder.cpp
-+++ b/src/qml/compiler/qqmlirbuilder.cpp
-@@ -1425,7 +1425,7 @@
- }
-
- // write objects
-- quint32 *objectTable = reinterpret_cast<quint32*>(data + qmlUnit->offsetToObjects);
-+ QV4::CompiledData::LEUInt32 *objectTable = reinterpret_cast<QV4::CompiledData::LEUInt32*>(data + qmlUnit->offsetToObjects);
- char *objectPtr = data + qmlUnit->offsetToObjects + objectOffsetTableSize;
- for (int i = 0; i < output.objects.count(); ++i) {
- const Object *o = output.objects.at(i);
-@@ -1467,7 +1467,7 @@
- objectToWrite->offsetToNamedObjectsInComponent = nextOffset;
- nextOffset += objectToWrite->nNamedObjectsInComponent * sizeof(quint32);
-
-- quint32 *functionsTable = reinterpret_cast<quint32*>(objectPtr + objectToWrite->offsetToFunctions);
-+ QV4::CompiledData::LEUInt32 *functionsTable = reinterpret_cast<QV4::CompiledData::LEUInt32*>(objectPtr + objectToWrite->offsetToFunctions);
- for (const Function *f = o->firstFunction(); f; f = f->next)
- *functionsTable++ = o->runtimeFunctionIndices.at(f->index);
-
-@@ -1493,7 +1493,7 @@
- bindingPtr = writeBindings(bindingPtr, o, &QV4::CompiledData::Binding::isValueBindingToAlias);
- Q_ASSERT((bindingPtr - objectToWrite->offsetToBindings - objectPtr) / sizeof(QV4::CompiledData::Binding) == unsigned(o->bindingCount()));
-
-- quint32 *signalOffsetTable = reinterpret_cast<quint32*>(objectPtr + objectToWrite->offsetToSignals);
-+ QV4::CompiledData::LEUInt32 *signalOffsetTable = reinterpret_cast<QV4::CompiledData::LEUInt32*>(objectPtr + objectToWrite->offsetToSignals);
- quint32 signalTableSize = 0;
- char *signalPtr = objectPtr + nextOffset;
- for (const Signal *s = o->firstSignal(); s; s = s->next) {
-@@ -1513,7 +1513,7 @@
- signalPtr += size;
- }
-
-- quint32 *namedObjectInComponentPtr = reinterpret_cast<quint32*>(objectPtr + objectToWrite->offsetToNamedObjectsInComponent);
-+ QV4::CompiledData::LEUInt32 *namedObjectInComponentPtr = reinterpret_cast<QV4::CompiledData::LEUInt32*>(objectPtr + objectToWrite->offsetToNamedObjectsInComponent);
- for (int i = 0; i < o->namedObjectsInComponent.count; ++i) {
- *namedObjectInComponentPtr++ = o->namedObjectsInComponent.at(i);
- }
---- a/src/qml/compiler/qv4compileddata.cpp
-+++ b/src/qml/compiler/qv4compileddata.cpp
-@@ -99,6 +99,7 @@
- , runtimeLookups(0)
- , runtimeRegularExpressions(0)
- , runtimeClasses(0)
-+ , constants(nullptr)
- , totalBindingsCount(0)
- , totalParserStatusCount(0)
- , totalObjectCount(0)
-@@ -239,6 +240,7 @@
- runtimeFunctions.clear();
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
- delete [] constants;
-+ constants = nullptr;
- #endif
- }
-
---- a/src/qml/compiler/qv4compiler.cpp
-+++ b/src/qml/compiler/qv4compiler.cpp
-@@ -335,29 +335,29 @@
- function->codeSize = 0;
-
- // write formals
-- quint32 *formals = (quint32 *)(f + function->formalsOffset);
-+ CompiledData::LEUInt32 *formals = (CompiledData::LEUInt32 *)(f + function->formalsOffset);
- for (int i = 0; i < irFunction->formals.size(); ++i)
- formals[i] = getStringId(*irFunction->formals.at(i));
-
- // write locals
-- quint32 *locals = (quint32 *)(f + function->localsOffset);
-+ CompiledData::LEUInt32 *locals = (CompiledData::LEUInt32 *)(f + function->localsOffset);
- for (int i = 0; i < irFunction->locals.size(); ++i)
- locals[i] = getStringId(*irFunction->locals.at(i));
-
- // write QML dependencies
-- quint32 *writtenDeps = (quint32 *)(f + function->dependingIdObjectsOffset);
-+ CompiledData::LEUInt32 *writtenDeps = (CompiledData::LEUInt32 *)(f + function->dependingIdObjectsOffset);
- for (int id : irFunction->idObjectDependencies) {
- Q_ASSERT(id >= 0);
- *writtenDeps++ = static_cast<quint32>(id);
- }
-
-- writtenDeps = (quint32 *)(f + function->dependingContextPropertiesOffset);
-+ writtenDeps = (CompiledData::LEUInt32 *)(f + function->dependingContextPropertiesOffset);
- for (auto property : irFunction->contextObjectPropertyDependencies) {
- *writtenDeps++ = property.key(); // property index
- *writtenDeps++ = property.value(); // notify index
- }
-
-- writtenDeps = (quint32 *)(f + function->dependingScopePropertiesOffset);
-+ writtenDeps = (CompiledData::LEUInt32 *)(f + function->dependingScopePropertiesOffset);
- for (auto property : irFunction->scopeObjectPropertyDependencies) {
- *writtenDeps++ = property.key(); // property index
- *writtenDeps++ = property.value(); // notify index
diff --git a/debian/patches/disableopengltests.patch b/debian/patches/disableopengltests.patch
index c4ca16e..7052a12 100644
--- a/debian/patches/disableopengltests.patch
+++ b/debian/patches/disableopengltests.patch
@@ -27,7 +27,7 @@ Last-Update: 2017-04-24
qqmlenginecontrol \
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
-@@ -23,7 +23,6 @@ PUBLICTESTS += \
+@@ -24,7 +24,6 @@
qqmlmoduleplugin \
qqmlnotifier \
qqmlqt \
@@ -35,7 +35,7 @@ Last-Update: 2017-04-24
qtqmlmodules \
qquickfolderlistmodel \
qqmlapplicationengine \
-@@ -87,10 +86,6 @@
+@@ -88,10 +87,6 @@
SUBDIRS += qmllint qmlplugindump
}
diff --git a/debian/patches/fix_test_remove_qlibraryinfo.patch b/debian/patches/fix_test_remove_qlibraryinfo.patch
index ba5d7ae..6d61388 100644
--- a/debian/patches/fix_test_remove_qlibraryinfo.patch
+++ b/debian/patches/fix_test_remove_qlibraryinfo.patch
@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+QMAKE_CXXFLAGS += -DTESTBINDIR=\\"$$PWD/bin\\"
+QMAKE_CXXFLAGS += -DTESTEXAMPLEDIR=\\"$$PWD/examples\\"
+
- MODULE_VERSION = 5.9.0
+ MODULE_VERSION = 5.9.1
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
@@ -64,7 +64,7 @@ tst_qmlmin::tst_qmlmin()
diff --git a/debian/patches/series b/debian/patches/series
index 418c1bc..71cb1c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
disableopengltests.patch
fix_test_remove_qlibraryinfo.patch
Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
-big_endian.patch
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list