[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-6-g5d5b983

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit d5e39a2eb5efa1d76f22d293ccb4fd4a02a6faf8
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 30 23:50:27 2014 +0100

    replace hurd_opengl_incldir.diff with upstream version
    
    backport upstream commit 8f0e84bec513ad28c3ec479053fbc59add3959e1
---
 debian/changelog                                   |  4 ++
 debian/patches/hurd_opengl_incldir.diff            | 29 ----------
 debian/patches/series                              |  2 +-
 ...m_small-improvements-to-the-hurd-g-mkspec.patch | 61 ++++++++++++++++++++++
 4 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3c8eec..48a802c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Replace patch hurd_opengl_incldir.diff with
+    upstream_small-improvements-to-the-hurd-g-mkspec.patch, backport of
+    upstream commit 8f0e84bec513ad28c3ec479053fbc59add3959e1.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Dec 2014 23:42:00 +0100
 
diff --git a/debian/patches/hurd_opengl_incldir.diff b/debian/patches/hurd_opengl_incldir.diff
deleted file mode 100644
index ee32d25..0000000
--- a/debian/patches/hurd_opengl_incldir.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-Description: hurd mkspec: remove X11R6-related library and include dirs
- Such X11 dirs have not been there for years now, and they can cause build
- issues in cmake-based projects (as they make cmake look in those directories
- for extra stuff like libGL)
-Last-Update: 2014-05-20
-Forwarded: https://codereview.qt-project.org/#/c/74467/
-
----
- mkspecs/hurd-g++/qmake.conf |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/mkspecs/hurd-g++/qmake.conf
-+++ b/mkspecs/hurd-g++/qmake.conf
-@@ -12,10 +12,10 @@ QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS
- 
- 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        =
diff --git a/debian/patches/series b/debian/patches/series
index 3f7da24..9a6ac1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-hurd_opengl_incldir.diff
+upstream_small-improvements-to-the-hurd-g-mkspec.patch
 mips_more_pre-mips32.diff
 gnukfreebsd.diff
 bsd_statfs.diff
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
new file mode 100644
index 0000000..f52f467
--- /dev/null
+++ b/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch
@@ -0,0 +1,61 @@
+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