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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5934879e846a994ea98ace3b562b0498338bbb39
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 13 01:29:29 2013 +0200

    fix/extend patch sha3_64bit_BE.diff
---
 debian/changelog                  |    3 +++
 debian/patches/sha3_64bit_BE.diff |   17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd6b0cf..4324404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.1.0+dfsg-5) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Extend patch sha3_64bit_BE.diff with another needed function; should
+    really fix build on s390x and ppc64 now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Aug 2013 01:26:34 +0200
 
diff --git a/debian/patches/sha3_64bit_BE.diff b/debian/patches/sha3_64bit_BE.diff
index f94dce0..a0825b4 100644
--- a/debian/patches/sha3_64bit_BE.diff
+++ b/debian/patches/sha3_64bit_BE.diff
@@ -1,8 +1,8 @@
 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
+Description: Enable fromBytesToWord and fromWordToBytes on big endian archs.
+ fromBytesToWord and fromWordToBytes are used in big endian code paths of
+ KeccakF-1600-opt64.c (for 64bit architectures).
+Last-Update: 2013-08-13
 Forwarded: no
 
 --- a/src/3rdparty/sha3/KeccakF-1600-opt64.c
@@ -16,3 +16,12 @@ Forwarded: no
  static void fromBytesToWord(UINT64 *word, const UINT8 *bytes)
  {
      unsigned int i;
+@@ -445,7 +445,7 @@ static void KeccakAbsorb(unsigned char *
+ #endif
+ }
+ 
+-#if 0 // Unused in the Qt configuration
++#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN)
+ static void fromWordToBytes(UINT8 *bytes, const UINT64 word)
+ {
+     unsigned int i;

-- 
qtbase packaging