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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit ab91ed921087a9113acac55f4346851b7890955f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 25 19:32:00 2015 -0300

    Remove try_to_ensure_that_fpic_is_used_in_cmake_builds.patch.
    
    Applied upstream.
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 -
 ..._ensure_that_fpic_is_used_in_cmake_builds.patch | 30 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d03fa26..27e7db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtbase-opensource-src (5.4.1+dfsg-5) UNRELEASED; urgency=medium
     - 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
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 18 May 2015 18:35:01 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 7a9175c..81cd48f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 upstream_small-improvements-to-the-hurd-g-mkspec.patch
 upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
-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
deleted file mode 100644
index 2a278a8..0000000
--- a/debian/patches/try_to_ensure_that_fpic_is_used_in_cmake_builds.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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(-)
-
---- a/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -71,8 +71,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})
- !!ENDIF
- 
- !!IF !isEmpty(QT_NAMESPACE)

-- 
qtbase packaging