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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit b5ba647e055bfec88fd789fd705705b4f66abaeb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 15 11:39:45 2015 -0300

    Refresh patch.
    
    It disn't apply cleanly.
---
 .../try_to_ensure_that_fpic_is_used_in_cmake_builds.patch   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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
index 6e05125..2a278a8 100644
--- 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
@@ -10,14 +10,14 @@ which are incompatible with Qt5 when built with -reduce-relocations.
 Task-number: QTBUG-45755
 Change-Id: I59a55ea15052f498104848c5fd867e563ddc2290
 ---
- src/corelib/Qt5CoreConfigExtras.cmake.in | 3 ++-
+
+---
+ 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)
+@@ -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)
@@ -25,9 +25,6 @@ index 48d5f21..d4abc5f 100644
  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)
- list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
--- 
-2.1.4
-

-- 
qtbase packaging