[SCM] qtdeclarative packaging branch, ubuntu-lts, updated. debian/5.6.1-11-121-gd2f0c1e
Timo Jyrinki
timo at moszumanska.debian.org
Mon Apr 3 04:50:01 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=d2f0c1e
The following commit has been merged in the ubuntu-lts branch:
commit d2f0c1e728176edba8af88e1c750ab12ca878818
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Mon Apr 3 04:48:16 2017 +0000
Retroactively add 5.6.2-0ubuntu1~~xenialoverlay1~7 that was published to overlay earlier
---
debian/changelog | 14 ++++++++++++--
debian/libqt5qml5.symbols | 7 ++++++-
...acility-to-version-type-information-for-debug.patch | 4 ++--
.../patches/V4-Fix-usage-of-QV4-Value-tags-types.patch | 12 ++++++------
.../V4-Free-up-2-address-bits-in-64bit-mode.patch | 18 +++++++++---------
debian/patches/series | 3 +++
debian/rules | 3 ++-
7 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c77d7cb..dac79e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~8) xenial; urgency=medium
+qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~9) xenial; urgency=medium
* Add patches required for supporting Qt Quick Controls 2 (ver 5.7) on 5.6.
- debian/patches/Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
@@ -10,7 +10,17 @@ qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~8) xenial; urgency=
- debian/patches/QQuickTextInput-include-padding-when-reporting-ancho.patch
* Update symbols.
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Wed, 08 Mar 2017 07:46:16 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Mon, 03 Apr 2017 04:49:08 +0000
+
+qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~7) xenial; urgency=medium
+
+ * Add patches to support arm64 kernel config change (LP: #1630906):
+ - Add-a-facility-to-version-type-information-for-debug.patch
+ - V4-Free-up-2-address-bits-in-64bit-mode.patch
+ - V4-Fix-usage-of-QV4-Value-tags-types.patch
+ * Update symbols.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Tue, 28 Feb 2017 11:43:21 +0000
qtdeclarative-opensource-src (5.6.2-0ubuntu1~~xenialoverlay1~4) xenial; urgency=medium
diff --git a/debian/libqt5qml5.symbols b/debian/libqt5qml5.symbols
index 8b62767..bab8ef8 100644
--- a/debian/libqt5qml5.symbols
+++ b/debian/libqt5qml5.symbols
@@ -1208,6 +1208,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZN3QV412EvalFunction11static_vtblE at Qt_5_PRIVATE_API 5.2.0~beta1 1
_ZN3QV412EvalFunction4callEPKNS_7ManagedEPNS_8CallDataE at Qt_5_PRIVATE_API 5.6.0~beta 1
(optional=templinst|arch=alpha mips64el sparc64)_ZN3QV413MemoryManager11allocObjectINS_6ObjectEEEPNT_4DataEPNS_13InternalClassEPS2_ at Qt_5_PRIVATE_API 5.6.0~beta 1
+ (optional=templinst|arch=powerpc)_ZN3QV413MemoryManager11allocObjectINS_6ObjectEEEPNT_4DataEv at Qt_5_PRIVATE_API 5.6.2 1
_ZN3QV413MemoryManager12setGCBlockedEb at Qt_5_PRIVATE_API 5.2.0~beta1 1
(subst)_ZN3QV413MemoryManager26growUnmanagedHeapSizeUsageE{size_t}@Qt_5_PRIVATE_API 5.5.1 1
_ZN3QV413MemoryManager4markEv at Qt_5_PRIVATE_API 5.2.0~beta1 1
@@ -1504,6 +1505,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection19convertTypeToSInt32EPNS_2IR4ExprES4_ at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection19convertTypeToUInt32EPNS_2IR4ExprES4_ at Qt_5_PRIVATE_API 5.4.0 1
(arch=!arm64 !powerpc !ppc64el !s390x !kfreebsd-amd64)_ZN3QV43JIT20InstructionSelection20visitCJumpStrictBoolEPNS_2IR5BinopEPNS2_10BasicBlockES6_ at Qt_5_PRIVATE_API 5.3.0 1
+ (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection20visitCJumpStrictNullEPNS_2IR5BinopEPNS2_10BasicBlockES6_ at Qt_5_PRIVATE_API 5.6.2 1
(arch=!arm64 !powerpc !ppc64el !s390x !kfreebsd-amd64)_ZN3QV43JIT20InstructionSelection21callBuiltinDeclareVarEbRK7QString at Qt_5_PRIVATE_API 5.3.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection21callBuiltinDeleteNameERK7QStringPNS_2IR4ExprE at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection21callBuiltinTypeofNameERK7QStringPNS_2IR4ExprE at Qt_5_PRIVATE_API 5.4.0 1
@@ -1524,11 +1526,11 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection24callBuiltinPushWithScopeEPNS_2IR4ExprE at Qt_5_PRIVATE_API 5.4.0 1
(arch=!arm64 !powerpc !ppc64el !s390x !kfreebsd-amd64)_ZN3QV43JIT20InstructionSelection24prepareVariableArgumentsEPNS_2IR8ExprListE at Qt_5_PRIVATE_API 5.3.0 1
(arch=!arm64 !powerpc !ppc64el !s390x !kfreebsd-amd64)_ZN3QV43JIT20InstructionSelection25callBuiltinPushCatchScopeERK7QString at Qt_5_PRIVATE_API 5.3.0 1
+ (arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection25visitCJumpStrictUndefinedEPNS_2IR5BinopEPNS2_10BasicBlockES6_ at Qt_5_PRIVATE_API 5.6.2 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection26callBuiltinDeleteSubscriptEPNS_2IR4ExprES4_S4_ at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection26callBuiltinTypeofSubscriptEPNS_2IR4ExprES4_S4_ at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection26callBuiltinUnwindExceptionEPNS_2IR4ExprE at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection27constructActivationPropertyEPNS_2IR4NameEPNS2_8ExprListEPNS2_4ExprE at Qt_5_PRIVATE_API 5.4.0 1
- (arch=!arm64 !kfreebsd-amd64 !powerpc !ppc64el !s390x)_ZN3QV43JIT20InstructionSelection29visitCJumpStrictNullUndefinedENS_2IR4TypeEPNS2_5BinopEPNS2_10BasicBlockES7_ at Qt_5_PRIVATE_API 5.6.2 1
(arch=!arm64 !powerpc !ppc64el !s390x !kfreebsd-amd64)_ZN3QV43JIT20InstructionSelection30callBuiltinConvertThisToObjectEv at Qt_5_PRIVATE_API 5.3.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection30callBuiltinDefineObjectLiteralEPNS_2IR4ExprEiPNS2_8ExprListES6_b at Qt_5_PRIVATE_API 5.4.0 1
(arch=amd64 armhf i386)_ZN3QV43JIT20InstructionSelection30callBuiltinSetupArgumentObjectEPNS_2IR4ExprE at Qt_5_PRIVATE_API 5.4.0 1
@@ -2755,6 +2757,8 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
_ZNK3QV45Value12toNumberImplEv at Qt_5_PRIVATE_API 5.2.0~beta1 1
_ZNK3QV45Value13asArrayLengthEPb at Qt_5_PRIVATE_API 5.6.0~beta 1
_ZNK3QV45Value16toQStringNoThrowEv at Qt_5_PRIVATE_API 5.2.0~beta1 1
+ (optional=templinst|arch=armhf i386 powerpc)_ZNK3QV45Value2asINS_14FunctionObjectEEEPKT_v at Qt_5_PRIVATE_API 5.6.2 1
+ (optional=templinst)_ZNK3QV45Value2asINS_14QObjectWrapperEEEPKT_v at Qt_5_PRIVATE_API 5.6.2 1
_ZNK3QV45Value8toObjectEPNS_15ExecutionEngineE at Qt_5_PRIVATE_API 5.5.0 1
_ZNK3QV45Value8toStringEPNS_15ExecutionEngineE at Qt_5_PRIVATE_API 5.3.0 1
_ZNK3QV45Value8toUInt16Ev at Qt_5_PRIVATE_API 5.2.0~beta1 1
@@ -3551,6 +3555,7 @@ libQt5Qml.so.5 libqt5qml5 #MINVER#
(c++)"non-virtual thunk to QV4::Moth::InstructionSelection::mutableCompilationUnit()@Qt_5_PRIVATE_API" 5.6.0 1
(c++)"non-virtual thunk to QV4::Moth::InstructionSelection::run(int)@Qt_5_PRIVATE_API" 5.3.0 1
(c++)"non-virtual thunk to QV4::Moth::InstructionSelection::~InstructionSelection()@Qt_5_PRIVATE_API" 5.3.0 1
+ qtDeclarativeHookData at Qt_5 5.6.2
qt_v4DebuggerHook at Qt_5 5.5.0
qt_v4ResolvePendingBreakpointsHook at Qt_5 5.5.0
qt_v4StackTrace at Qt_5 5.3.0
diff --git a/debian/patches/Add-a-facility-to-version-type-information-for-debug.patch b/debian/patches/Add-a-facility-to-version-type-information-for-debug.patch
index 720e47f..6448f64 100644
--- a/debian/patches/Add-a-facility-to-version-type-information-for-debug.patch
+++ b/debian/patches/Add-a-facility-to-version-type-information-for-debug.patch
@@ -13,7 +13,7 @@ Reviewed-by: Ulf Hermann <ulf.hermann at qt.io>
1 file changed, 18 insertions(+)
diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp
-index 35dc110..ea98bb1 100644
+index 35dc110e9..ea98bb16f 100644
--- a/src/qml/debugger/qqmldebug.cpp
+++ b/src/qml/debugger/qqmldebug.cpp
@@ -119,4 +119,22 @@ bool QQmlDebuggingEnabler::connectToLocalDebugger(const QString &socketFileName,
@@ -40,5 +40,5 @@ index 35dc110..ea98bb1 100644
+
QT_END_NAMESPACE
--
-2.9.3
+2.11.0
diff --git a/debian/patches/V4-Fix-usage-of-QV4-Value-tags-types.patch b/debian/patches/V4-Fix-usage-of-QV4-Value-tags-types.patch
index 00f7b40..0291d5e 100644
--- a/debian/patches/V4-Fix-usage-of-QV4-Value-tags-types.patch
+++ b/debian/patches/V4-Fix-usage-of-QV4-Value-tags-types.patch
@@ -17,7 +17,7 @@ Reviewed-by: Simon Hausmann <simon.hausmann at qt.io>
5 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
-index 1913b39..05afc1e 100644
+index 1913b398e..05afc1ee7 100644
--- a/src/qml/jit/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
@@ -965,7 +965,7 @@ void InstructionSelection::swapValues(IR::Expr *source, IR::Expr *target)
@@ -48,7 +48,7 @@ index 1913b39..05afc1e 100644
}
_as->or64(Assembler::TrustedImm64(tag << 32),
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp
-index 85d8155..6316737 100644
+index 85d8155d3..631673723 100644
--- a/src/qml/jsruntime/qv4arraydata.cpp
+++ b/src/qml/jsruntime/qv4arraydata.cpp
@@ -98,7 +98,7 @@ Q_STATIC_ASSERT(sizeof(Heap::ArrayData) == sizeof(Heap::SparseArrayData));
@@ -136,7 +136,7 @@ index 85d8155..6316737 100644
return true;
}
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
-index fd3bd1f..3f70a41 100644
+index fd3bd1f66..3f70a41a1 100644
--- a/src/qml/jsruntime/qv4persistent.cpp
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -133,7 +133,7 @@ PersistentValueStorage::Iterator &PersistentValueStorage::Iterator::operator++()
@@ -149,7 +149,7 @@ index fd3bd1f..3f70a41 100644
}
index = -1;
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
-index ebe43b5..1333912 100644
+index ebe43b505..13339129e 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -220,6 +220,17 @@ public:
@@ -193,7 +193,7 @@ index ebe43b5..1333912 100644
{
Primitive v;
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
-index 2588d8d..b11c8c5 100644
+index 2588d8db0..b11c8c510 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -454,7 +454,7 @@ void MemoryManager::sweep(bool lastSweep)
@@ -206,5 +206,5 @@ index 2588d8d..b11c8c5 100644
else
remainingWeakQObjectWrappers.append(v);
--
-2.9.3
+2.11.0
diff --git a/debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch b/debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch
index a1e2acc..b46e348 100644
--- a/debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch
+++ b/debian/patches/V4-Free-up-2-address-bits-in-64bit-mode.patch
@@ -21,7 +21,7 @@ Reviewed-by: Lars Knoll <lars.knoll at qt.io>
8 files changed, 269 insertions(+), 152 deletions(-)
diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp
-index ea98bb1..e864469 100644
+index ea98bb16f..e864469da 100644
--- a/src/qml/debugger/qqmldebug.cpp
+++ b/src/qml/debugger/qqmldebug.cpp
@@ -132,7 +132,7 @@ quintptr Q_QML_EXPORT qtDeclarativeHookData[] = {
@@ -34,7 +34,7 @@ index ea98bb1..e864469 100644
Q_STATIC_ASSERT(HookCount == sizeof(qtDeclarativeHookData) / sizeof(qtDeclarativeHookData[0]));
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp
-index 929726f..b7dbc81 100644
+index 929726f4b..b7dbc81f9 100644
--- a/src/qml/jit/qv4assembler.cpp
+++ b/src/qml/jit/qv4assembler.cpp
@@ -133,8 +133,30 @@ void Assembler::generateCJumpOnNonZero(RegisterID reg, IR::BasicBlock *currentBl
@@ -97,7 +97,7 @@ index 929726f..b7dbc81 100644
and32(Assembler::TrustedImm32(Value::NotDouble_Mask), Assembler::ScratchRegister);
Assembler::Jump isNoDbl = branch32(Assembler::Equal, Assembler::ScratchRegister,
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h
-index 532a311..ba9ca66 100644
+index 532a3114f..ba9ca6693 100644
--- a/src/qml/jit/qv4assembler_p.h
+++ b/src/qml/jit/qv4assembler_p.h
@@ -374,6 +374,11 @@ public:
@@ -113,7 +113,7 @@ index 532a311..ba9ca66 100644
IR::BasicBlock *currentBlock, IR::BasicBlock *trueBlock,
IR::BasicBlock *falseBlock);
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
-index b6df5fb..1913b39 100644
+index b6df5fb08..1913b398e 100644
--- a/src/qml/jit/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
@@ -703,7 +703,7 @@ void InstructionSelection::loadString(const QString &str, IR::Expr *target)
@@ -283,7 +283,7 @@ index b6df5fb..1913b39 100644
return true;
}
diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
-index 6e9b02b..f6d9364 100644
+index 6e9b02b03..f6d936406 100644
--- a/src/qml/jit/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
@@ -166,8 +166,8 @@ protected:
@@ -298,7 +298,7 @@ index 6e9b02b..f6d9364 100644
bool visitCJumpNullUndefined(IR::Type nullOrUndef, IR::Binop *binop,
IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock);
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
-index 0b063ee..ca23f83 100644
+index 0b063ee4b..ca23f83cf 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -309,7 +309,7 @@ struct ScopedCallData {
@@ -311,7 +311,7 @@ index 0b063ee..ca23f83 100644
}
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
-index 5abf5ad..02425c5 100644
+index 5abf5ad9e..02425c52a 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -70,23 +70,85 @@ private:
@@ -658,7 +658,7 @@ index 5abf5ad..02425c5 100644
Encode(ReturnedValue v) {
val = v;
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
-index 024a72b..4688908 100644
+index 024a72bde..468890828 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -563,7 +563,7 @@ QV4::ReturnedValue VME::run(ExecutionEngine *engine, const uchar *code
@@ -779,5 +779,5 @@ index 024a72b..4688908 100644
callData->thisObject = QV4::Primitive::undefinedValue();
STOREVALUE(instr.result, Runtime::constructGlobalLookup(engine, instr.index, callData));
--
-2.9.3
+2.11.0
diff --git a/debian/patches/series b/debian/patches/series
index 5486fe7..65afe61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,9 @@
# Backported patches
QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
+Add-a-facility-to-version-type-information-for-debug.patch
+V4-Free-up-2-address-bits-in-64bit-mode.patch
fix-V4-on-big-endian.patch
+V4-Fix-usage-of-QV4-Value-tags-types.patch
Fix-visibility-of-properties-in-value-types.patch
QQuickItem-added-isAncestorOf.patch
Private-export-QQuickStateAction-for-Qt-Quick-Contro.patch
diff --git a/debian/rules b/debian/rules
index 3c5fa3b..bbb75f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,8 @@ override_dh_auto_test-arch:
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
- xvfb-run -a \
+ # Make the tests non-fatal, see the 5.7.1~20161021-2 changelog.
+ -xvfb-run -a \
-s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list