[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.7.0-2-117-g098eb2a

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit 098eb2a03452af22dbd3f0ca9663c52f49ece75b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Sep 12 07:32:23 2016 +0000

    Rebase QML cache patch for 5.7 and add arm64 support.
---
 debian/changelog                                         |  2 +-
 .../QML-Compilation-unit-caching-and-JIT-changes.patch   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 811e976..f8b63b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ qtdeclarative-opensource-src (5.7.0-2ubuntu1) UNRELEASED; urgency=medium
     - debian/patches/Fix-visibility-of-properties-in-value-types.patch
     - debian/patches/disable_failing_tests.patch
     - debian/patches/fix_binary_location_for_tests.patch
-  * Rebase QML cache patch for 5.7.
+  * Rebase QML cache patch for 5.7 and add arm64 support.
   * Update symbols and mark private ones.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 07 Sep 2016 13:12:08 +0000
diff --git a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
index 15984af..b638bb6 100644
--- a/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
+++ b/debian/patches/QML-Compilation-unit-caching-and-JIT-changes.patch
@@ -1187,3 +1187,19 @@ Index: qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/qv4global_p.h
  #else
  #define ENABLE_YARR_JIT 0
  #define ENABLE_ASSEMBLER 0
+diff -urN qtdeclarative-opensource-src-5.7.0.old/src/3rdparty/masm/assembler/ARM64Assembler.h qtdeclarative-opensource-src-5.7.0/src/3rdparty/masm/assembler/ARM64Assembler.h
+--- qtdeclarative-opensource-src-5.7.0.old/src/3rdparty/masm/assembler/ARM64Assembler.h	2016-06-11 12:05:08.000000000 +0000
++++ qtdeclarative-opensource-src-5.7.0/src/3rdparty/masm/assembler/ARM64Assembler.h	2016-09-08 11:13:19.460760204 +0000
+@@ -570,6 +570,12 @@
+         ConditionInvalid
+     } Condition;
+ 
++    // Code inherited from the QMLC project
++    void appendData(char *data, int len)
++    {
++        return m_buffer.appendData(data, len);
++    }
++
+     static Condition invert(Condition cond)
+     {
+         return static_cast<Condition>(cond ^ 1);

-- 
qtdeclarative packaging