[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=c3923e2

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

    Enable sparc processor detection.
    
    Also fix typo in previous changelog entry.
---
 debian/changelog                                      |  2 +-
 debian/patches/do_not_pass_wcast-align_on_sparc.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 568988c..8d4b625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
   * Remove unused piece of code in debian/rules.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Enable proecessor detection for s390[x].
+  * Enable processor detection for s390[x] and sparc.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:21:17 +0400
 
diff --git a/debian/patches/do_not_pass_wcast-align_on_sparc.patch b/debian/patches/do_not_pass_wcast-align_on_sparc.patch
new file mode 100644
index 0000000..1938148
--- /dev/null
+++ b/debian/patches/do_not_pass_wcast-align_on_sparc.patch
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf
+index ab0a722..1e420b0 100644
+--- a/mkspecs/features/qt_headersclean.prf
++++ b/mkspecs/features/qt_headersclean.prf
+@@ -18,7 +18,7 @@
+ # Enable pedantic mode, but accept variadic macros and 'long long' usage.
+ *-g++*: QMAKE_CXXFLAGS += -Wno-long-long -Wno-variadic-macros -pedantic-errors
+ 
+-contains(QT_ARCH,arm)|contains(QT_ARCH,mips) {
++contains(QT_ARCH,arm)|contains(QT_ARCH,mips)|contains(QT_ARCH,sparc) {
+     # There are outstanding alignment issues in some container classes.
+     *-g++*:QMAKE_CXXFLAGS -= -Wcast-align
+ }

-- 
qtbase packaging