[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.0+dfsg-1-259-g27e3221

[Simon Quigley]

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

The following commit has been merged in the ubuntu+1 branch:
commit 27e3221d8de480381e87cbb20766d798a55c0575
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sun Jun 11 19:21:30 2017 -0500

    Whoops, I didn't see armv4.diff
---
 debian/changelog          |  1 -
 debian/patches/armv4.diff | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6b4f7cf..d625715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,6 @@ qtbase-opensource-src (5.9.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     - Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
   * Remove the following patches from the tree that were not specified in the
     series file:
-    - armv4.diff
     - xcb-Fix-drag-and-drop-to-Emacs.patch
     - xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
   * Add revert-automatic-code-attribution-docs.patch which reverts a
diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff
new file mode 100644
index 0000000..987ad42
--- /dev/null
+++ b/debian/patches/armv4.diff
@@ -0,0 +1,26 @@
+Description: support ARMv4 architecture, needed for armel builds
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2016-07-01
+
+--- a/src/corelib/global/qprocessordetection.h
++++ b/src/corelib/global/qprocessordetection.h
+@@ -130,6 +130,8 @@
+ #  elif defined(__ARM_ARCH_5TEJ__) \
+         || defined(__ARM_ARCH_5TE__)
+ #    define Q_PROCESSOR_ARM 5
++#  elif defined(__ARM_ARCH_4T__)
++#    define Q_PROCESSOR_ARM 4
+ #  else
+ #    define Q_PROCESSOR_ARM 0
+ #  endif
+@@ -144,6 +146,9 @@
+ #  endif
+ #  if Q_PROCESSOR_ARM >= 5
+ #    define Q_PROCESSOR_ARM_V5
++#  endif
++#  if Q_PROCESSOR_ARM >= 4
++#    define Q_PROCESSOR_ARM_V4
+ #  else
+ #    error "ARM architecture too old"
+ #  endif

-- 
qtbase packaging