[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-7-g5690814

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 7631047913345e61983e1f131f1f073b92d802ff
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jul 3 13:00:31 2015 -0300

    Remove backported patches already present upstream.
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  2 -
 ...PS-atomic-support-on-pre-MIPS32-architect.patch | 33 ------------
 ...m_small-improvements-to-the-hurd-g-mkspec.patch | 61 ----------------------
 4 files changed, 3 insertions(+), 96 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3bee0d5..4348d91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
   * Update symbols files with buildd's logs.
+  * Remove backported patches already present in this release:
+    - upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
+    - upstream_small-improvements-to-the-hurd-g-mkspec.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 6175555..41a51a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 # Backported stuff
-upstream_small-improvements-to-the-hurd-g-mkspec.patch
-upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
 
 # Debian specific.
diff --git a/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch b/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
deleted file mode 100644
index 02dc565..0000000
--- a/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ec14ae0b267780d6bfa5c7453c906caeee3bc00 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 27 Dec 2014 17:54:47 +0100
-Subject: [PATCH] Complete MIPS atomic support on pre-MIPS32 architectures
-
-Extend the support for pre-MIPS32 architectures (done mostly in
-60b6b28c213a420ee40e254ff1823876098e0a04) also to orderedMemoryFence.
-
-Change-Id: I50b9091c16166b8434a07988053c1f901d528237
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- src/corelib/arch/qatomic_mips.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h
-index b8a9665..b99c70f 100644
---- a/src/corelib/arch/qatomic_mips.h
-+++ b/src/corelib/arch/qatomic_mips.h
-@@ -120,7 +120,10 @@ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
- template <int size> template <typename T> inline
- void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
- {
--    asm volatile ("sync 0" ::: "memory");
-+    asm volatile (".set push
"
-+                  ".set mips32
"
-+                  "sync 0
"
-+                  ".set pop
" ::: "memory");
- }
- 
- template<> template<typename T> inline
--- 
-2.1.4
-
diff --git a/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch b/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch
deleted file mode 100644
index f52f467..0000000
--- a/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8f0e84bec513ad28c3ec479053fbc59add3959e1 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 27 Dec 2014 17:32:51 +0100
-Subject: [PATCH] small improvements to the hurd-g++ mkspec
-
-- remove the X11R6 paths, since they were gone for years, and their
-  lack may cause build issues with CMake config files
-- add empty QMAKE_*_XCB variables, as done in the common linux.conf
-- add to QMAKE_PLATFORM, not just reset it (just done in other mkspecs)
-- borrow QMAKE_LFLAGS_GCSECTIONS from the common linux.conf
-
-Change-Id: I94e05032f8195bbda73dffe1da02eec7ac679045
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- mkspecs/hurd-g++/qmake.conf | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
-index 54a152d..d53b49c 100644
---- a/mkspecs/hurd-g++/qmake.conf
-+++ b/mkspecs/hurd-g++/qmake.conf
-@@ -3,19 +3,20 @@
- #
- 
- MAKEFILE_GENERATOR      = UNIX
--QMAKE_PLATFORM          = hurd
-+QMAKE_PLATFORM         += hurd
- CONFIG                 += incremental
- QMAKE_INCREMENTAL_STYLE = sublib
- 
- QMAKE_CFLAGS_THREAD    += -D_REENTRANT
- QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
-+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
- 
- QMAKE_INCDIR            =
- QMAKE_LIBDIR            =
--QMAKE_INCDIR_X11        = /usr/X11R6/include
--QMAKE_LIBDIR_X11        = /usr/X11R6/lib
--QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
-+QMAKE_INCDIR_X11        =
-+QMAKE_LIBDIR_X11        =
-+QMAKE_INCDIR_OPENGL     =
-+QMAKE_LIBDIR_OPENGL     =
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =
-@@ -33,6 +34,10 @@ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
- QMAKE_LIBS_OPENVG       = -lOpenVG
- QMAKE_LIBS_THREAD       = -lpthread
- 
-+QMAKE_CFLAGS_XCB        =
-+QMAKE_LIBS_XCB          =
-+QMAKE_DEFINES_XCB       =
-+
- QMAKE_AR                = ar cqs
- QMAKE_OBJCOPY           = objcopy
- QMAKE_NM                = nm -P
--- 
-2.1.4
-

-- 
qtbase packaging