[SCM] qtbase packaging branch, experimental, updated. debian/5.7.0+dfsg-1-5-g287fa4f

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 4559eda51a2cf549016d46c9b5565c7e98e2b999
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jul 1 19:58:36 2016 +0300

    Add support for ARMv4 architecture, needed to get armel builds working.
---
 debian/changelog          |  1 +
 debian/patches/armv4.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ea07694..d92e139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.7.0+dfsg-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add a patch (qdevicediscovery_dummy.diff) to fix a linking error on
     GNU/kFreeBSD.
+  * Add support for ARMv4 architecture, needed to get armel builds working.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 29 Jun 2016 18:44:30 +0300
 
diff --git a/debian/patches/armv4.diff b/debian/patches/armv4.diff
new file mode 100644
index 0000000..d4c2146
--- /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
+@@ -127,6 +127,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
+@@ -141,6 +143,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
diff --git a/debian/patches/series b/debian/patches/series
index 6f6ba2c..ce2e1a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 qdevicediscovery_dummy.diff
+armv4.diff

-- 
qtbase packaging