[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-1-2-gb946afe

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit b946afe3514cb8896a6ed14cc61621a42ab8c687
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 20 15:22:52 2014 -0300

    Add revert_upstream_bsymbolic_change.patch by Timo Jyrinki
---
 debian/changelog                                      |  3 +++
 debian/patches/revert_upstream_bsymbolic_change.patch | 18 ++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d71826..37ef6bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.3.0+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add revert_upstream_bsymbolic_change.patch by Timo Jyrinki which reenables
+    -Bsymbolic-functions on non-x86 since Debian has a recent enough binutils.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 20 May 2014 15:20:06 -0300
 
diff --git a/debian/patches/revert_upstream_bsymbolic_change.patch b/debian/patches/revert_upstream_bsymbolic_change.patch
new file mode 100644
index 0000000..32fba60
--- /dev/null
+++ b/debian/patches/revert_upstream_bsymbolic_change.patch
@@ -0,0 +1,18 @@
+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 cb1615a..cb0f483 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ do_not_pass_wcast-align_on_sparc.patch
 
 # Debian specific.
 remove_google_adsense.patch
+revert_upstream_bsymbolic_change.patch

-- 
qtbase packaging