Hi, > Hi dear maintainer, the following patch taken from avutil (where the code has > been copied), > has been uploaded on deferred/5
Upstream gave an additional fix that works, so I uploaded it on deferred/2, new debdiff attached. G.
diff -Nru goldendict-1.5.0~git20160508.g92b5485/debian/changelog goldendict-1.5.0~git20160508.g92b5485/debian/changelog
--- goldendict-1.5.0~git20160508.g92b5485/debian/changelog 2016-05-08 09:02:18.000000000 +0200
+++ goldendict-1.5.0~git20160508.g92b5485/debian/changelog 2016-06-03 18:14:27.000000000 +0200
@@ -1,3 +1,13 @@
+goldendict (1.5.0~git20160508.g92b5485-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch:
+ - fix 64 bit Big Endian build failures (Closes: #824929).
+ thanks Adam Conrad for the great help there and upstream for
+ the replacing-fix.
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Fri, 03 Jun 2016 18:09:50 +0200
+
goldendict (1.5.0~git20160508.g92b5485-1) unstable; urgency=medium
* New snapshot.
diff -Nru goldendict-1.5.0~git20160508.g92b5485/debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch goldendict-1.5.0~git20160508.g92b5485/debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch
--- goldendict-1.5.0~git20160508.g92b5485/debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch 1970-01-01 01:00:00.000000000 +0100
+++ goldendict-1.5.0~git20160508.g92b5485/debian/patches/8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch 2016-06-03 18:13:41.000000000 +0200
@@ -0,0 +1,115 @@
+From 8e11d2a0bdec3ccf24ebb61d468b005543b899ee Mon Sep 17 00:00:00 2001
+From: Abs62 <ottom...@yandex.ru>
+Date: Fri, 3 Jun 2016 18:37:34 +0300
+Subject: [PATCH] Fix build on Big Endian 64 bit machines (issue #714)
+
+---
+ ripemd.cc | 24 ++++++++++++------------
+ ripemd.hh | 13 +++++++------
+ 2 files changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/ripemd.cc b/ripemd.cc
+index bad8fc7..14dd491 100644
+--- a/ripemd.cc
++++ b/ripemd.cc
+@@ -22,11 +22,11 @@
+ #include <QtEndian>
+
+
+-static const uint32_t KA[4] = {
++static const quint32 KA[4] = {
+ 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xa953fd4e
+ };
+
+-static const uint32_t KB[4] = {
++static const quint32 KB[4] = {
+ 0x50a28be6, 0x5c4dd124, 0x6d703ef3, 0x7a6d76e9
+ };
+
+@@ -120,10 +120,10 @@ RIPEMD128::RIPEMD128()
+ state[3] = 0x10325476;
+ }
+
+-void RIPEMD128::transform( const uint8_t buffer[64] )
++void RIPEMD128::transform( const uchar buffer[64] )
+ {
+- uint32_t a, b, c, d, e, f, g, h;
+- uint32_t block[16];
++ quint32 a, b, c, d, e, f, g, h;
++ quint32 block[16];
+ int n;
+
+ a = e = state[0];
+@@ -132,7 +132,7 @@ void RIPEMD128::transform( const uint8_t buffer[64] )
+ d = h = state[3];
+
+ for (n = 0; n < 16; n++)
+- block[n] = qFromLittleEndian<uint32_t>( buffer + 4 * n );
++ block[n] = qFromLittleEndian<quint32>( buffer + 4 * n );
+ n = 0;
+
+ R128_0; R128_0; R128_0; R128_0;
+@@ -150,7 +150,7 @@ void RIPEMD128::transform( const uint8_t buffer[64] )
+ state[0] = h;
+ }
+
+-void RIPEMD128::update( const uint8_t * data, size_t len )
++void RIPEMD128::update( const uchar * data, size_t len )
+ {
+ size_t i, j;
+
+@@ -171,13 +171,13 @@ void RIPEMD128::update( const uint8_t * data, size_t len )
+ memcpy( &buffer[j], &data[i], len - i );
+ }
+
+-void RIPEMD128::digest( uint8_t * digest )
++void RIPEMD128::digest( uchar * digest )
+ {
+- uint64_t finalcount = qFromLittleEndian( count << 3 );
+- update( (const uint8_t *) "\200", 1 );
++ quint64 finalcount = qFromLittleEndian( count << 3 );
++ update( (const uchar *) "\200", 1 );
+ while ( ( count & 63 ) != 56 )
+- update( ( const uint8_t * ) "", 1 );
+- update( ( uint8_t * ) &finalcount, 8 ); /* Should cause a transform() */
++ update( ( const uchar * ) "", 1 );
++ update( ( uchar * ) &finalcount, 8 ); /* Should cause a transform() */
+ for ( int i = 0; i < 4; i++ )
+ qToLittleEndian( state[i], digest + i*4 );
+ }
+diff --git a/ripemd.hh b/ripemd.hh
+index 9b17f63..53db34b 100644
+--- a/ripemd.hh
++++ b/ripemd.hh
+@@ -20,6 +20,7 @@
+ #define __RIPEMD_HH_INCLUDED__
+
+ #include <stddef.h>
++#include <QtGlobal>
+
+ #if defined( _MSC_VER ) && _MSC_VER < 1800 // VS2012 and older
+ #include <stdint_msvc.h>
+@@ -33,17 +34,17 @@ public:
+ RIPEMD128();
+
+ // Update hash value
+- void update( const uint8_t * data, size_t len );
++ void update( const uchar * data, size_t len );
+
+ // Finish hashing and output digest value.
+- void digest( uint8_t * digest );
++ void digest( uchar * digest );
+
+ private:
+- uint64_t count; // number of bytes in buffer
+- uint8_t buffer[64]; // 512-bit buffer of input values used in hash updating
+- uint32_t state[10]; // current hash value
++ quint64 count; // number of bytes in buffer
++ uchar buffer[64]; // 512-bit buffer of input values used in hash updating
++ quint32 state[10]; // current hash value
+
+- void transform( const uint8_t buffer[64] );
++ void transform( const uchar buffer[64] );
+ };
+
+ #endif // __RIPEMD_HH_INCLUDED__
diff -Nru goldendict-1.5.0~git20160508.g92b5485/debian/patches/series goldendict-1.5.0~git20160508.g92b5485/debian/patches/series
--- goldendict-1.5.0~git20160508.g92b5485/debian/patches/series 2015-09-23 10:22:52.000000000 +0200
+++ goldendict-1.5.0~git20160508.g92b5485/debian/patches/series 2016-06-03 18:09:50.000000000 +0200
@@ -1,2 +1,3 @@
disable-autostart-control
wordnet-dict-paths
+8e11d2a0bdec3ccf24ebb61d468b005543b899ee.patch
signature.asc
Description: OpenPGP digital signature
