[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.5.0+dfsg-4-47-gc387b32

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f2bf9d410152abd783a5fe27e4a58ad7041db687
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Aug 17 11:14:41 2015 +0000

    Remove unapplied patches.
---
 debian/patches/latest_fpic_commits.patch           | 51 ----------------------
 .../patches/revert_upstream_bsymbolic_change.patch | 18 --------
 debian/patches/series                              |  1 -
 3 files changed, 70 deletions(-)

diff --git a/debian/patches/latest_fpic_commits.patch b/debian/patches/latest_fpic_commits.patch
deleted file mode 100644
index 432aaed..0000000
--- a/debian/patches/latest_fpic_commits.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/revert_upstream_bsymbolic_change.patch b/debian/patches/revert_upstream_bsymbolic_change.patch
deleted file mode 100644
index 32fba60..0000000
--- a/debian/patches/revert_upstream_bsymbolic_change.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Revert upstream's disabling of -Bsymbolic-functions on non-x86
- The claimed binutils upstream fix is already in utopic:
- https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=97323ad11305610185a0265392cabcd37510f50e
-Author: Timo Jyrinki <timo.jyrinki at canonical.com>
-
---- b/config.tests/unix/bsymbolic_functions.test
-+++ a/config.tests/unix/bsymbolic_functions.test
-@@ -6,10 +6,6 @@
- 
- 
- cat >>bsymbolic_functions.c << EOF
--#if !(defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(__amd64))
--#error "Symbolic function binding on this architecture may be broken, disabling it (see QTBUG-36129)."
--#endif
--
- int main() { return 0; }
- EOF
- 
diff --git a/debian/patches/series b/debian/patches/series
index b77e8d7..4625d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ Fix-compile-error-on-big-endian.patch
 
 # Debian specific.
 gnukfreebsd.diff
-#revert_upstream_bsymbolic_change.patch # https://launchpad.net/bugs/1403758
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 hurd-forkfd.diff

-- 
qtbase packaging