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

Timo Jyrinki timo at moszumanska.debian.org
Thu Jun 4 10:18:57 UTC 2015 

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

The following commit has been merged in the ubuntu branch:
commit 961c6d18e044994d4224c30388d0d352889083be
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Jun 4 10:15:55 2015 +0000

    Re-enable the other fpic patches, and do not enforce fpie anymore
    
    * Re-enable the other fpic patches, and do not enforce fpie anymore
    * debian/patches/latest_fpic_commits.patch: Take even more of the 5.4.2
      last minute patches.
---
 debian/changelog                         |  7 +++--
 debian/patches/enable_pie.patch          |  5 ++--
 debian/patches/latest_fpic_commits.patch | 51 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  8 ++---
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c84c85..ed5ff98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-qtbase-opensource-src (5.4.1+dfsg-4ubuntu3) UNRELEASED; urgency=medium
+qtbase-opensource-src (5.4.1+dfsg-4ubuntu3) wily; urgency=medium
 
   * debian/patches/series: enable_pie.patch is actually an upstreamed patch
+  * Re-enable the other fpic patches, and do not enforce fpie anymore
+  * debian/patches/latest_fpic_commits.patch: Take even more of the 5.4.2 
+    last minute patches.
 
- -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 28 May 2015 06:33:25 +0000
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 03 Jun 2015 13:06:41 +0000
 
 qtbase-opensource-src (5.4.1+dfsg-4ubuntu2) wily; urgency=medium
 
diff --git a/debian/patches/enable_pie.patch b/debian/patches/enable_pie.patch
index ad9193e..fa85ad9 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,14 +66,12 @@ list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_
+@@ -66,15 +66,13 @@ 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,8 +29,9 @@ 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_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
- set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\")
+ set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
 -!!ENDIF
  
  !!IF !isEmpty(QT_NAMESPACE)
diff --git a/debian/patches/latest_fpic_commits.patch b/debian/patches/latest_fpic_commits.patch
new file mode 100644
index 0000000..432aaed
--- /dev/null
+++ b/debian/patches/latest_fpic_commits.patch
@@ -0,0 +1,51 @@
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index d4abc5f..65fd1f9 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -71,8 +71,13 @@ set(_qt5_corelib_extra_includes)
+ # macro to add it.
+ set(Qt5_POSITION_INDEPENDENT_CODE True)
+ 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 (CMAKE_VERSION VERSION_LESS 2.8.12
++        AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
++        OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
++    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
++else()
++    set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_COMPILE_OPTIONS $$QMAKE_CXXFLAGS_APP)
++endif()
+ 
+ !!IF !isEmpty(QT_NAMESPACE)
+ list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
+diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
+index 9c81754..cfbb381 100644
+--- a/src/corelib/Qt5CoreMacros.cmake
++++ b/src/corelib/Qt5CoreMacros.cmake
+@@ -281,8 +281,10 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9)
+             set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
+             set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
+             set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
+-
+-            if (Qt5_POSITION_INDEPENDENT_CODE)
++            if (Qt5_POSITION_INDEPENDENT_CODE
++                    AND (CMAKE_VERSION VERSION_LESS 2.8.12
++                        AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
++                        OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)))
+                 set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE})
+             endif()
+         endforeach()
+diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index 4547877..d974240 100644
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -1047,7 +1047,8 @@ Q_CORE_EXPORT int qrand();
+ #  define QT_NO_SHAREDMEMORY
+ #endif
+ 
+-#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && (!defined(__PIC__) || defined(__PIE__))
++#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && \
++    (!defined(__PIC__) || (defined(__PIE__) && defined(Q_CC_GNU) && Q_CC_GNU >= 500))
+ #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
+          "Compile your code with -fPIC (-fPIE is not enough)."
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 3c1fa47..a967b5e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,11 +5,11 @@ gnukfreebsd.diff
 cve-2015-0295.diff
 qtsystemtrayicon_handle_submenus_correctly.patch
 xcb_delay_showing_tray_icon_window_until_it_is_embedded.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
+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
 enable_pie.patch
+latest_fpic_commits.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

More information about the pkg-kde-commits mailing list