[SCM] qtbase packaging branch, experimental, updated. debian/5.4.1+dfsg-2-24-g79ca3f3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 79ca3f34092b5ed6b0c0bde78f20512451578471
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 14 13:06:37 2015 -0300

    Backport patch to fix CMake files.
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 +
 ..._ensure_that_fpic_is_used_in_cmake_builds.patch | 33 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9c8a84e..d652997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.4.1+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add try_to_ensure_that_fpic_is_used_in_cmake_builds.patch, it seems
+    that apps using CMake files as provided by Qt5 are FTBFS.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 14 May 2015 13:05:04 -0300
 
 qtbase-opensource-src (5.4.1+dfsg-3) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index b3bb713..57f15e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ cve-2015-0295.diff
 qtsystemtrayicon_handle_submenus_correctly.patch
 xcb_delay_showing_tray_icon_window_until_it_is_embedded.patch
 require_fpic_instead_of_fpie.patch
+try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
 make_qglobal_h_complain_if_you_use_fpie.patch
 fixes_crash_in_bmp_and_ico_image_decoders.patch
 fixes_crash_in_gif_image_decoder.patch
diff --git a/debian/patches/try_to_ensure_that_fpic_is_used_in_cmake_builds.patch b/debian/patches/try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
new file mode 100644
index 0000000..6e05125
--- /dev/null
+++ b/debian/patches/try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
@@ -0,0 +1,33 @@
+From 54486a3b2b3754b93587c4904423f28bee7a690d Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Mon, 11 May 2015 12:20:57 +0300
+Subject: [PATCH] Try to ensure that -fPIC is used in CMake builds
+
+In commit 36d6eb721e7d5997ade75e289d4088dc48678d0d the -fPIE switch was
+replaced with -fPIC in an effort to avoid generating copy relocations
+which are incompatible with Qt5 when built with -reduce-relocations.
+
+Task-number: QTBUG-45755
+Change-Id: I59a55ea15052f498104848c5fd867e563ddc2290
+---
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index 48d5f21..d4abc5f 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -70,8 +70,9 @@ set(_qt5_corelib_extra_includes)
+ # Qt5_POSITION_INDEPENDENT_CODE variable is used in the # qt5_use_module
+ # macro to add it.
+ set(Qt5_POSITION_INDEPENDENT_CODE True)
+-set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
+ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIC\")
++set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
++set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
+ 
+ !!IF !isEmpty(QT_NAMESPACE)
+ list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
+-- 
+2.1.4
+

-- 
qtbase packaging