[SCM] qtbase packaging branch, experimental, updated. debian/5.3.1+dfsg-5-10-g81421cc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 81421cc9f0ef75704c656014cd1231c8103dde74
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Sep 16 09:52:42 2014 -0300

    Remove Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch.
    
    Applied upstream.
---
 debian/changelog                                   |  6 ++--
 .../Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch   | 40 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d5604f..4aa1c88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ qtbase-opensource-src (5.3.2+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
-  * Remove support_mips_atomic_on_pre-mips32_archs.patch, applied upstream with
-    a fix.
+  * Remove patches applied upstream:
+    - support_mips_atomic_on_pre-mips32_archs.patch, applied upstream with a
+      fix.
+    - Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 14:58:47 +0400
 
diff --git a/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch b/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
deleted file mode 100644
index 602df52..0000000
--- a/debian/patches/Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/series b/debian/patches/series
index 9eb9ff3..6710ff4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ remove_icon_from_example.patch
 hurd_opengl_incldir.diff
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
-Remove-Wcast-align-from-QMAKE_CXXFLAGS.patch
 cmake_dont_check_existence_of_gl_filesin_qt5gui.patch
 
 # Debian specific.

-- 
qtbase packaging