[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.2+dfsg-4-9-g97730fc

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 97730fc51c7454f22e668492fbcfd32df3952ca7
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Jul 23 13:01:17 2015 +0200

    Fix packages for armhf
    
    * Drop revert_upstream_bsymbolic_change.patch, still broken on armhf (QTBUG-47350)
    * Let configure work out if reduce-relocations is supported
---
 debian/changelog                                      |  4 ++++
 debian/patches/revert_upstream_bsymbolic_change.patch | 18 ------------------
 debian/patches/series                                 |  1 -
 debian/rules                                          |  1 -
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfdaf28..5c6135d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 qtbase-opensource-src (5.4.2+dfsg-5) UNRELEASED; urgency=medium
 
 
+  [ Rohan Garg ]
+  * Drop revert_upstream_bsymbolic_change.patch, still broken on armhf (QTBUG-47350)
+  * Let configure work out if reduce-relocations is supported
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
 
 qtbase-opensource-src (5.4.2+dfsg-4) unstable; urgency=medium
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 6175555..16b52e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@ upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
 gnukfreebsd.diff
 
 # Debian specific.
-revert_upstream_bsymbolic_change.patch
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
diff --git a/debian/rules b/debian/rules
index 2ed9843..f55ec58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,7 +126,6 @@ override_dh_auto_configure:
 	            -verbose \
 	            -optimized-qmake \
 	            -dbus-linked \
-	            -reduce-relocations \
 		    -no-strip \
 	            -no-separate-debug-info \
 	            -qpa xcb \

-- 
qtbase packaging