[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta2-1-7-g8159a42

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 60ce4962a71ea9c8cfd3fd8dbbbc83e59d228163
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat May 6 15:18:04 2017 +0300

    Update qv4isel_always_export.patch to the proposed patch set 2.
---
 debian/changelog                           |  1 +
 debian/patches/qv4isel_always_export.patch | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f702c42..9a71774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.9.0~beta3-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update symbols files from buildds’ logs.
+  * Update qv4isel_always_export.patch to the proposed patch set 2.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 May 2017 14:52:37 +0300
 
diff --git a/debian/patches/qv4isel_always_export.patch b/debian/patches/qv4isel_always_export.patch
index 7962a6f..4ae45f7 100644
--- a/debian/patches/qv4isel_always_export.patch
+++ b/debian/patches/qv4isel_always_export.patch
@@ -1,11 +1,11 @@
 Description: build fix for architectures where we don’t support the JIT
 Author: Simon Hausmann <simon.hausmann at qt.io>
 Origin: https://codereview.qt-project.org/193778
-Last-Update: 2017-05-05
+Last-Update: 2017-05-06
 
 --- a/src/qml/jit/qv4isel_masm.cpp
 +++ b/src/qml/jit/qv4isel_masm.cpp
-@@ -1633,6 +1633,8 @@
+@@ -1633,14 +1633,20 @@
      return result;
  }
  
@@ -13,8 +13,12 @@ Last-Update: 2017-05-05
 +
  QT_BEGIN_NAMESPACE
  namespace QV4 { namespace JIT {
++#if ENABLE(ASSEMBLER)
  template class Q_QML_EXPORT InstructionSelection<>;
-@@ -1641,6 +1643,7 @@
+ template class Q_QML_EXPORT ISelFactory<>;
++#endif
++
+ #if defined(V4_BOOTSTRAP)
  
  Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture)
  {
@@ -22,7 +26,7 @@ Last-Update: 2017-05-05
      using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>;
      using ARM64CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARM64, NoOperatingSystemSpecialization>>;
  
-@@ -1661,6 +1664,7 @@
+@@ -1661,6 +1667,7 @@
  #endif
      if (!hostArch.isEmpty() && architecture == hostArch)
          return new ISelFactory<>;
@@ -30,7 +34,7 @@ Last-Update: 2017-05-05
  
      return nullptr;
  }
-@@ -1669,4 +1673,3 @@
+@@ -1669,4 +1676,3 @@
  } }
  QT_END_NAMESPACE
  

-- 
qtdeclarative packaging