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

[Lisandro Damián Nicanor Pérez]

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

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

    Fix arch detection for arm64.
---
 debian/changelog                                   |  4 +-
 .../patches/aarch64_arm64_fix_arch_detection.patch | 49 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 83c3e59..6bc7861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Disable the use of system proxies by default. It seems that if http_proxy
     is setted then all protocols try to use the proxy.
-  * Make arm64 use linux-g++ as platform_arg.
+  * Add support for arm64 (Closes: #735488).
+    - Make arm64 use linux-g++ as platform_arg.
+    - Fix arch detection.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Aug 2014 12:02:33 -0300
 
diff --git a/debian/patches/aarch64_arm64_fix_arch_detection.patch b/debian/patches/aarch64_arm64_fix_arch_detection.patch
new file mode 100644
index 0000000..fbbd75b
--- /dev/null
+++ b/debian/patches/aarch64_arm64_fix_arch_detection.patch
@@ -0,0 +1,49 @@
+From 800abbba658203fc8e746e3fc780a297cd4110cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
+ <perezmeyer at gmail.com>
+Date: Wed, 20 Aug 2014 17:52:49 -0300
+Subject: [PATCH] Fix AArch64/arm64 detection.
+
+The detection needs to go before arm, else the system will detect AArch64/arm64
+as arm.
+
+This patch comes from Wookey, he has agreed to put it under BSD or Expat
+to allow it's inclusion in here:
+<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255>
+
+Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797
+---
+ configure | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index a9ba7c8..eb88b72 100755
+--- a/configure
++++ b/configure
+@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+     	fi
+     	CFG_HOST_ARCH=s390
+     	;;
+-    *:*:arm*)
++    *:*:aarch64*|*:*:arm64*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    ARM (arm)"
++            echo "    AArch64 (aarch64)"
+         fi
+-        CFG_HOST_ARCH=arm
++        CFG_HOST_ARCH=aarch64
+         ;;
+-    *:*:aarch64*)
++    *:*:arm*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+-            echo "    AArch64 (aarch64)"
++            echo "    ARM (arm)"
+         fi
+-        CFG_HOST_ARCH=aarch64
++        CFG_HOST_ARCH=arm
+         ;;
+     Linux:*:sparc*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+-- 
+2.1.0
+

-- 
Qt 4 packaging