[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.6.1-4ubuntu2-19-gb4899f9

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=b4899f9

The following commit has been merged in the ubuntu branch:
commit b4899f9f58fb0423828f3ff8c773c0fc45f0772a
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Sep 15 11:11:26 2016 +0000

    Fix series file and remove Debian specific s390x fix as there is upstream patch too.
---
 debian/patches/fix_engine_64bits_big_endian.diff | 26 ------------------------
 debian/patches/series                            |  4 ----
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/fix_engine_64bits_big_endian.diff b/debian/patches/fix_engine_64bits_big_endian.diff
deleted file mode 100644
index e5342b3..0000000
--- a/debian/patches/fix_engine_64bits_big_endian.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Maximilaino Curia <maxy at debian.org>
-Date: Tue, 19 Jul 2016 12:20:00 +0200
-Subject: Fix engine in big endian 64 arches (s390x)
-
-This fixes https://bugreports.qt.io/browse/QTBUG-54717
-
---- a/src/qml/jsruntime/qv4value_p.h
-+++ b/src/qml/jsruntime/qv4value_p.h
-@@ -92,10 +92,16 @@
- 
-     Q_ALWAYS_INLINE quint64 val() const { return _val; }
-     Q_ALWAYS_INLINE void setVal(quint64 v) { _val = v; }
-+
-+#if defined(QV4_USE_64_BIT_VALUE_ENCODING) && Q_BYTE_ORDER == Q_BIG_ENDIAN
-+    Q_ALWAYS_INLINE void setValue(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
-+    Q_ALWAYS_INLINE void setTag(quint32 v) { memcpy(&_val, &v, 4); }
-+#else
-     Q_ALWAYS_INLINE void setValue(quint32 v) { memcpy(&_val, &v, 4); }
-     Q_ALWAYS_INLINE void setTag(quint32 t) { memcpy(4 + (quint8 *)&_val, &t, 4); }
-+#endif
- 
--#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
-+#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN || defined(QV4_USE_64_BIT_VALUE_ENCODING)
-     static inline int valueOffset() { return 0; }
-     static inline int tagOffset() { return 4; }
-     Q_ALWAYS_INLINE void setTagValue(quint32 tag, quint32 value) { _val = quint64(tag) << 32 | value; }
diff --git a/debian/patches/series b/debian/patches/series
index ad91113..1ca0092 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,7 +15,3 @@ check_system_double-conversion.patch
 fix_binary_location_for_tests.patch
 disable_failing_tests.patch
 QML-Compilation-unit-caching-and-JIT-changes.patch
-
-# Debian patches
-check_system_double-conversion.patch
-fix_engine_64bits_big_endian.diff

-- 
qtdeclarative packaging