[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-2-4-g6f461e5

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 6f461e52cd9e900fc7d9368772775996a373cc63
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 23 23:26:55 2014 -0300

    Backport Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch.
    
    Disables Wcast-align completely.
    
    Drop patch to remove Wcast-align frm sparc, it is now not longer needed.
---
 debian/changelog                                   |  4 +++
 .../Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch   | 40 ++++++++++++++++++++++
 .../patches/do_not_pass_wcast-align_on_sparc.patch | 17 ---------
 debian/patches/series                              |  2 +-
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcd6b24..80ffa77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtbase-opensource-src (5.3.0+dfsg-3) UNRELEASED; urgency=medium
     - Modify mark_private_symbols.sh.
     - Run mark_private_symbols.sh from debian/rules.
   * Do not override dh_builddeb: xz compression is now the default method.
+  * Backport Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch. This totally
+    disables -Wcast-align (Closes: #744311).
+    - Remove do_not_pass_wcast-align_on_sparc.patch, it s now not needed
+      anymore.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2014 00:31:54 -0300
 
diff --git a/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch b/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
new file mode 100644
index 0000000..602df52
--- /dev/null
+++ b/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
@@ -0,0 +1,40 @@
+From 7dd635e8f7d242054a64717e5ba3333ec1758704 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
+ <perezmeyer at gmail.com>
+Date: Thu, 22 May 2014 20:19:29 -0300
+Subject: [PATCH] Remove -Wcast-align from QMAKE_CXXFLAGS.
+
+x86 doesn't care about alignment, and on all other platforms where it
+does something it causes build errors, so instead of removing it on
+those platforms just don't enable it at all.
+
+Change-Id: Idfeb387099b28af60ba161b6ca678b7c9df17fe1
+---
+ mkspecs/features/qt_headersclean.prf | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf
+index ab0a722..0650adf 100644
+--- a/mkspecs/features/qt_headersclean.prf
++++ b/mkspecs/features/qt_headersclean.prf
+@@ -13,16 +13,11 @@
+ *-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef
+ 
+ # Other nice flags
+-*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wcast-align -Wchar-subscripts -Wpointer-arith -Wformat-security
++*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wchar-subscripts -Wpointer-arith -Wformat-security
+ 
+ # 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) {
+-    # There are outstanding alignment issues in some container classes.
+-    *-g++*:QMAKE_CXXFLAGS -= -Wcast-align
+-}
+-
+ QMAKE_CXXFLAGS += -DQT_NO_CAST_TO_ASCII \
+                   -DQT_NO_CAST_FROM_ASCII \
+                   -DQT_STRICT_ITERATORS \
+-- 
+2.0.0.rc2
+
diff --git a/debian/patches/do_not_pass_wcast-align_on_sparc.patch b/debian/patches/do_not_pass_wcast-align_on_sparc.patch
deleted file mode 100644
index 6947d7c..0000000
--- a/debian/patches/do_not_pass_wcast-align_on_sparc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: do not pass Wcast-align on sparc.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: https://codereview.qt-project.org/#change,74516
-
-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
- }
diff --git a/debian/patches/series b/debian/patches/series
index cb0f483..aec5720 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@ support_mips_atomic_on_pre-mips32_archs.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 enable_sparc_detection.patch
-do_not_pass_wcast-align_on_sparc.patch
+Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
 
 # Debian specific.
 remove_google_adsense.patch

-- 
qtbase packaging