[SCM] qtbase packaging branch, master, updated. debian/5.1.0+dfsg-3-2-g5b2ee63

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5b2ee632b0201c19a415fb7edb6adf5ddd44818a
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 11 12:51:45 2013 +0200

    fix build of SHA3 on 64bit big endian archs
---
 debian/changelog                  |    3 +++
 debian/patches/series             |    1 +
 debian/patches/sha3_64bit_BE.diff |   18 ++++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7798dba..2133c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.1.0+dfsg-4) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix build of the SHA3 implementation on 64bit big endian architectures
+    (e.g. s390x and ppc64); patch sha3_64bit_BE.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 11 Aug 2013 11:40:49 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c347bd7..61d7370 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 deppath_gnu.diff
 Dont_check_for_the_existence_of_priv_inc_dirs.patch
+sha3_64bit_BE.diff
 
 # Debian specific.
diff --git a/debian/patches/sha3_64bit_BE.diff b/debian/patches/sha3_64bit_BE.diff
new file mode 100644
index 0000000..f94dce0
--- /dev/null
+++ b/debian/patches/sha3_64bit_BE.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Enable fromBytesToWord on big endian architectures.
+ fromBytesToWord is used in big endian code paths of KeccakF-1600-opt64.c
+ (for 64bit architectures).
+Last-Update: 2013-08-11
+Forwarded: no
+
+--- a/src/3rdparty/sha3/KeccakF-1600-opt64.c
++++ b/src/3rdparty/sha3/KeccakF-1600-opt64.c
+@@ -324,7 +324,7 @@ static void KeccakPermutation(unsigned c
+     KeccakPermutationOnWords((UINT64*)state);
+ }
+ 
+-#if 0 // Unused in the Qt configuration
++#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
+ static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
+ {
+     unsigned int i;

-- 
qtbase packaging