[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-7-3-g82945b1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 82945b1c5ed62486cdd1de31c2d62694823645a2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Feb 7 13:09:25 2014 -0300

    Remove sha3_64bit_BE.diff, applied upstream.
---
 debian/changelog                  |  1 +
 debian/patches/series             |  1 -
 debian/patches/sha3_64bit_BE.diff | 27 ---------------------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78df84e..5740c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.2.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
+  * Remove sha3_64bit_BE.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Feb 2014 13:06:24 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index b04601b..5ba6c5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-sha3_64bit_BE.diff
 linux_no_perf.diff
 hurd_opengl_incldir.diff
 fix_power_atomic_code.patch
diff --git a/debian/patches/sha3_64bit_BE.diff b/debian/patches/sha3_64bit_BE.diff
deleted file mode 100644
index a0825b4..0000000
--- a/debian/patches/sha3_64bit_BE.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Pino Toscano <toscano.pino at tiscali.it>
-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
-+++ 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;
-@@ -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