[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.1+dfsg-4ubuntu2

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit b1073559c101587460571eeb09783dfb21dc13a0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri May 22 11:48:33 2015 +0000

    Redisable the fpic/fpie patches again until there is a better solution. (LP: #1457840)
---
 debian/changelog                | 7 +++++++
 debian/patches/enable_pie.patch | 6 ++----
 debian/patches/series           | 7 ++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d5aa1e..4f83c3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.4.1+dfsg-4ubuntu2) wily; urgency=medium
+
+  * Redisable the fpic/fpie patches again until there is a better solution.
+    (LP: #1457840)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 22 May 2015 11:47:02 +0000
+
 qtbase-opensource-src (5.4.1+dfsg-4ubuntu1) wily; urgency=medium
 
   * Sync with Debian 5.4.1+dfsg-4, drop more delta:
diff --git a/debian/patches/enable_pie.patch b/debian/patches/enable_pie.patch
index 41a6149..ad9193e 100644
--- a/debian/patches/enable_pie.patch
+++ b/debian/patches/enable_pie.patch
@@ -20,7 +20,7 @@ Index: qtbase-opensource-src-5.4.0+dfsg/src/corelib/Qt5CoreConfigExtras.cmake.in
 ===================================================================
 --- qtbase-opensource-src-5.4.0+dfsg.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ qtbase-opensource-src-5.4.0+dfsg/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -66,15 +66,13 @@ list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_
+@@ -66,14 +66,12 @@ list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_
  set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5_corelib_extra_includes})
  set(_qt5_corelib_extra_includes)
  
@@ -29,10 +29,8 @@ Index: qtbase-opensource-src-5.4.0+dfsg/src/corelib/Qt5CoreConfigExtras.cmake.in
  # Qt5_POSITION_INDEPENDENT_CODE variable is used in the # qt5_use_module
  # macro to add it.
  set(Qt5_POSITION_INDEPENDENT_CODE True)
--set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIC\")
-+set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\")
  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})
+ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\")
 -!!ENDIF
  
  !!IF !isEmpty(QT_NAMESPACE)
diff --git a/debian/patches/series b/debian/patches/series
index 9934d39..023918d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,9 +5,10 @@ gnukfreebsd.diff
 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
+# On hold until GCC5
+#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
 tst_QNetworkDiskCache-Stop-using-actual-web-servers.patch

-- 
qtbase packaging