[SCM] qtbase packaging branch, master, updated. debian/5.3.1+dfsg-2-4-g3d14182

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8855db8a38e667c70215e7095a9edaffade47eb1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jul 4 22:32:20 2014 -0300

    Backport patch for not requiring libegl1-mesa-dev.
---
 debian/changelog                                   |  2 +
 ...dont_check_existence_of_gl_filesin_qt5gui.patch | 75 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 78 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c168ca3..ff29748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.3.1+dfsg-3) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Improve NEWS wording.
+  * Add cmake_dont_check_existence_of_gl_filesin_qt5gui.patch to avoid Qt GUI
+    requiring libegl1-mesa-dev (Closes: #752847).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 01 Jul 2014 01:15:10 -0300
 
diff --git a/debian/patches/cmake_dont_check_existence_of_gl_filesin_qt5gui.patch b/debian/patches/cmake_dont_check_existence_of_gl_filesin_qt5gui.patch
new file mode 100644
index 0000000..1c6dfe8
--- /dev/null
+++ b/debian/patches/cmake_dont_check_existence_of_gl_filesin_qt5gui.patch
@@ -0,0 +1,75 @@
+From 6c1d355154e4edf2fe2cd63ee038dc83ce0a417d Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <stephen.kelly at kdab.com>
+Date: Thu, 3 Jul 2014 14:52:21 +0200
+Subject: [PATCH] CMake: Don't check the existence of GL files in the Qt5Gui
+ package.
+
+The GL libraries are optional, so they should not be added to the
+DEPENDENT libraries of Qt5::Gui if not found.
+
+Task-number: QTBUG-39859
+Change-Id: Ib0e01da56a9fb5048a6ad8e0e9cede07fe0cf43b
+---
+ src/gui/Qt5GuiConfigExtras.cmake.in | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index d734e56..9a846d4 100644
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -66,7 +66,8 @@ if (NOT _qt5gui_OPENGL_INCLUDE_DIR)
+ endif()
+ unset(_GL_INCDIRS)
+ 
+-_qt5_Gui_check_file_exists(${_qt5gui_OPENGL_INCLUDE_DIR})
++# Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is
++# optional.
+ 
+ list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR})
+ set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR})
+@@ -105,13 +106,18 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+             )
+ !!IF mac
+             set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}")
++            if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}")
++                set(Qt5Gui_${_cmake_lib_name}_LIBRARY)
++            endif()
+ !!ENDIF
+-            if (WIN32 AND NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
++            if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
+                 # The above find_library call doesn\'t work for finding
+                 # libraries in Windows SDK paths outside of the proper
+-                # environment.  Just add the library name to the result
+-                # variable instead.
+-                # We avoid doing this in the first case because Qt may be
++                # environment, even if the libraries are present.  In other
++                # cases it is OK for the libraries to not be found
++                # because they are optional dependencies of Qt5Gui, needed
++                # only if the qopengl.h header is used.
++                # We try to find the libraries in the first place because Qt may be
+                 # compiled with another set of GL libraries (such as coming
+                 # from ANGLE).  The point of these find calls is to try to
+                 # find the same binaries as Qt is compiled with (as they are
+@@ -119,7 +125,6 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+                 # above with paths known to qmake.
+                 set(_Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE TRUE)
+                 unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
+-                list(APPEND Qt5Gui_${Name}_LIBRARIES ${_lib})
+             else()
+                 add_library(Qt5::Gui_${_cmake_lib_name} SHARED IMPORTED)
+                 set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_${Name}_INCLUDE_DIRS})
+@@ -152,11 +157,6 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+             endif()
+         endif()
+     endforeach()
+-    if (NOT CMAKE_CROSSCOMPILING)
+-        foreach(_dir ${Qt5Gui_${Name}_INCLUDE_DIRS})
+-            _qt5_Gui_check_file_exists(${_dir})
+-        endforeach()
+-    endif()
+ endmacro()
+ 
+ 
+-- 
+2.0.1
+
diff --git a/debian/patches/series b/debian/patches/series
index cfea459..cff6675 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ support_mips_atomic_on_pre-mips32_archs.patch
 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.
 remove_google_adsense.patch

-- 
qtbase packaging