[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-10-g3f65bac

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d991526728ff708b28a8859339670089d26a049a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 23 12:11:59 2014 -0300

    Add ppc64el_configure_support.patch to properly detect ppc64*
    
    Patch from Ubuntu's William Grant. Thanks William!
---
 debian/changelog                               |  2 ++
 debian/patches/ppc64el_configure_support.patch | 32 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6aecc1d..56beaec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-2) UNRELEASED; urgency=medium
   * Add support for ppc64el (Closes: #749743).
     - Add ppc64el to 07_trust_dpkg-arch_over_uname-m.diff, as the uname output
       differs from the arch name.
+    - Add ppc64el_configure_support.patch to properly detect ppc64* in
+      configure. Patch from Ubuntu's William Grant. Thanks William!
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Aug 2014 12:02:33 -0300
 
diff --git a/debian/patches/ppc64el_configure_support.patch b/debian/patches/ppc64el_configure_support.patch
new file mode 100644
index 0000000..40d6b91
--- /dev/null
+++ b/debian/patches/ppc64el_configure_support.patch
@@ -0,0 +1,32 @@
+Subject: Add configure support for ppc64el
+Origin: vendor, http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
+Author: William Grant <wgrant at ubuntu.com>
+Author: Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>
+Last-Update: 2014-08-22
+Forwarded: no
+
+This patch was originally introduced [1] and rebased [2] in Ubuntu Trusty [3].
+
+Some chunks were changed/removed on Debian:
+  - The DPKG_ARCH / UNAME_MACHINE mapping is actually Debian-specific, and done
+    in another patch; so this chunk is now there.
+  - The 'PLATFORM=qws/linux-*-g++' setting is not required; ppc64el builds fine
+    with the default 'linux-generic-g++'  (the difference to the previously set
+    'linux-x86_64-g++' is just '-m64', which is default/only-option on ppc64el).
+
+[1] http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
+[2] http://launchpadlibrarian.net/162331250/qt4-x11_4:4.8.4+dfsg-0ubuntu22_4:4.8.5+git192-g085f851+dfsg-2ubuntu1.diff.gz
+[3] https://launchpad.net/ubuntu/+source/qt4-x11/+changelog
+
+diff -pruN a/configure b/configure
+--- qt4-x11-4.8.6+dfsg.orig/configure	2014-03-17 13:53:25.000000000 +0000
++++ qt4-x11-4.8.6+dfsg/configure	2014-03-17 13:55:46.000000000 +0000
+@@ -3277,7 +3280,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+         fi
+         CFG_HOST_ARCH=powerpc
+         ;;
+-    *:*:ppc64)
++    *:*:ppc64*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+             echo "    64-bit PowerPC (powerpc)"
+         fi
diff --git a/debian/patches/series b/debian/patches/series
index 96c0c6c..746d758 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,4 @@ qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
 remove_addsense.patch
 parisc-atomic.patch
+ppc64el_configure_support.patch

-- 
Qt 4 packaging