[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 12a45e282dcc963d369f751cc17438f0b664245f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Dec 31 15:05:47 2013 -0300

    Enable proecessor detection for s390[x].
---
 debian/changelog                           |  3 +++
 debian/patches/enable_s390_detection.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af9f525..568988c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Remove unused piece of code in debian/rules.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Enable proecessor detection for s390[x].
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:21:17 +0400
 
 qtbase-opensource-src (5.2.0+dfsg-3) experimental; urgency=low
diff --git a/debian/patches/enable_s390_detection.patch b/debian/patches/enable_s390_detection.patch
new file mode 100644
index 0000000..6b61633
--- /dev/null
+++ b/debian/patches/enable_s390_detection.patch
@@ -0,0 +1,27 @@
+Description: enable s390[x] processor detection
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://codereview.qt-project.org/#change,74514
+
+diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
+index 623e30a..dde8db0 100644
+--- a/src/corelib/global/qprocessordetection.h
++++ b/src/corelib/global/qprocessordetection.h
+@@ -267,12 +267,12 @@
+ 
+     S390 is big-endian.
+ */
+-// #elif defined(__s390__)
+-// #  define Q_PROCESSOR_S390
+-// #  if defined(__s390x__)
+-// #    define Q_PROCESSOR_S390_X
+-// #  endif
+-// #  define Q_BYTE_ORDER Q_BIG_ENDIAN
++#elif defined(__s390__)
++#  define Q_PROCESSOR_S390
++#  if defined(__s390x__)
++#    define Q_PROCESSOR_S390_X
++#  endif
++#  define Q_BYTE_ORDER Q_BIG_ENDIAN
+ 
+ /*
+     SuperH family, optional revision: SH-4A
diff --git a/debian/patches/series b/debian/patches/series
index 79d1a8a..34249fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ mips_more_pre-mips32.diff
 gnukfreebsd.diff
 
 # Debian specific.
+enable_s390_detection.patch

-- 
qtbase packaging