[SCM] qtbase packaging branch, master, updated. debian/5.1.1+dfsg-3-3-g203e297

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 203e2971821c24b2c173a5dc0ef374ba3fc842e8
Author: Pino Toscano <pino at debian.org>
Date:   Sun Oct 6 23:29:43 2013 +0200

    remove X11R6 libs- and include-dirs from hurd-g++ mkspec
    
    they might cause issues
---
 debian/changelog                        |    2 ++
 debian/patches/hurd_opengl_incldir.diff |   25 +++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fae6355..0394cab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.1.1+dfsg-4) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Limit the libasound2-dev build dependency as linux-any, as the oss-alsa
     replacement is not usable for qt5 anyway.
+  * Remove X11R6 library- and include-dirs from the hurd-g++ mkspec, as they
+    might cause issues; patch hurd_opengl_incldir.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Oct 2013 15:38:08 +0200
 
diff --git a/debian/patches/hurd_opengl_incldir.diff b/debian/patches/hurd_opengl_incldir.diff
new file mode 100644
index 0000000..36bd93c
--- /dev/null
+++ b/debian/patches/hurd_opengl_incldir.diff
@@ -0,0 +1,25 @@
+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: 2013-10-06
+Forwarded: no
+
+--- 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_ES1 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
diff --git a/debian/patches/series b/debian/patches/series
index 5a46304..348d46c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 sha3_64bit_BE.diff
 linux_no_perf.diff
 fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
+hurd_opengl_incldir.diff
 
 # Debian specific.

-- 
qtbase packaging