[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-6-g3a0bd7c

[Simon Quigley]

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

The following commit has been merged in the experimental branch:
commit 6e90c711723f04a6be0a2a62db71eeb7cefcc562
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Fri Jun 2 23:28:37 2017 -0500

    Remove qv4isel_always_export.patch as it's reverse-applicable.
---
 debian/changelog                           |  1 +
 debian/patches/qv4isel_always_export.patch | 41 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index def3d55..0932194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
 
   [ Simon Quigley ]
   * New upstream release.
+  * Remove qv4isel_always_export.patch as it's reverse-applicable.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Jun 2017 23:08:37 -0500
 
diff --git a/debian/patches/qv4isel_always_export.patch b/debian/patches/qv4isel_always_export.patch
deleted file mode 100644
index 4ae45f7..0000000
--- a/debian/patches/qv4isel_always_export.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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-06
-
---- a/src/qml/jit/qv4isel_masm.cpp
-+++ b/src/qml/jit/qv4isel_masm.cpp
-@@ -1633,14 +1633,20 @@
-     return result;
- }
- 
-+#endif // ENABLE(ASSEMBLER)
-+
- QT_BEGIN_NAMESPACE
- namespace QV4 { namespace JIT {
-+#if ENABLE(ASSEMBLER)
- template class Q_QML_EXPORT InstructionSelection<>;
- template class Q_QML_EXPORT ISelFactory<>;
-+#endif
-+
- #if defined(V4_BOOTSTRAP)
- 
- Q_QML_EXPORT QV4::EvalISelFactory *createISelForArchitecture(const QString &architecture)
- {
-+#if ENABLE(ASSEMBLER)
-     using ARMv7CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARMv7, NoOperatingSystemSpecialization>>;
-     using ARM64CrossAssembler = QV4::JIT::Assembler<AssemblerTargetConfiguration<JSC::MacroAssemblerARM64, NoOperatingSystemSpecialization>>;
- 
-@@ -1661,6 +1667,7 @@
- #endif
-     if (!hostArch.isEmpty() && architecture == hostArch)
-         return new ISelFactory<>;
-+#endif // ENABLE(ASSEMBLER)
- 
-     return nullptr;
- }
-@@ -1669,4 +1676,3 @@
- } }
- QT_END_NAMESPACE
- 
--#endif // ENABLE(ASSEMBLER)
diff --git a/debian/patches/series b/debian/patches/series
index 3291798..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
-qv4isel_always_export.patch

-- 
qtdeclarative packaging