[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=0c3588e

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

    Do not use Wcast-align on sparc.
    
    This causes FTBFSs.
    
    Also push series' changes.
---
 debian/changelog                            |  1 +
 debian/patches/enable_sparc_detection.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                       |  4 +++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8d4b625..d67ba35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Enable processor detection for s390[x] and sparc.
+    - Do not use Wcast-align on header's tests on sparc, thus avoiding a FTBFS.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:21:17 +0400
 
diff --git a/debian/patches/enable_sparc_detection.patch b/debian/patches/enable_sparc_detection.patch
new file mode 100644
index 0000000..79693f9
--- /dev/null
+++ b/debian/patches/enable_sparc_detection.patch
@@ -0,0 +1,27 @@
+Description: enable sparc processor detection
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://codereview.qt-project.org/#change,74515
+
+diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
+index 623e30a..684b7b5 100644
+--- a/src/corelib/global/qprocessordetection.h
++++ b/src/corelib/global/qprocessordetection.h
+@@ -292,12 +292,12 @@
+     SPARC is big-endian only prior to V9, while V9 is bi-endian with big-endian
+     as the default byte order. Assume all SPARC systems are big-endian.
+ */
+-// #elif defined(__sparc__)
+-// #  define Q_PROCESSOR_SPARC
+-// #  if defined(__sparc_v9__)
+-// #    define Q_PROCESSOR_SPARC_V9
+-// #  endif
+-// #  define Q_BYTE_ORDER Q_BIG_ENDIAN
++#elif defined(__sparc__)
++#  define Q_PROCESSOR_SPARC
++#  if defined(__sparc_v9__)
++#    define Q_PROCESSOR_SPARC_V9
++#  endif
++#  define Q_BYTE_ORDER Q_BIG_ENDIAN
+ 
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 34249fd..527f0af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,8 @@ support_mips_atomic_on_pre-mips32_archs.patch
 uname_include.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
+enable_s390_detection.patch
+enable_sparc_detection.patch
+do_not_pass_wcast-align_on_sparc.patch
 
 # Debian specific.
-enable_s390_detection.patch

-- 
qtbase packaging