diff options
Diffstat (limited to 'user/kwallet/kwallet-5.22.0-blowfish-endianness.patch')
| -rw-r--r-- | user/kwallet/kwallet-5.22.0-blowfish-endianness.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch index 9d76cc25c..3234cc105 100644 --- a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch +++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch @@ -1,6 +1,6 @@ --- kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc.old 2016-12-03 21:12:17.000000000 +0000 +++ kwallet-5.29.0/src/runtime/kwalletd/backend/blowfish.cc 2017-01-29 18:02:10.193293280 +0000 -@@ -31,9 +31,7 @@ +@@ -19,12 +19,7 @@ #include "blowfishtables.h" @@ -8,19 +8,22 @@ -// We need to live with -Wundef until someone really figures out the problem. -//#include <QtCore/qglobal.h> // for Q_BYTE_ORDER and friends +#include <QtGlobal> // for Q_BYTE_ORDER and friends +-// Workaround for -Wundef +-#define Q_BIG_ENDIAN 1 +-#define Q_BYTE_ORDER Q_BIG_ENDIAN BlowFish::BlowFish() { -@@ -135,7 +133,7 @@ +@@ -126,7 +121,7 @@ return init(); } - + // clang-format off -#if Q_BYTE_ORDER == Q_BIG_ENDIAN +#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN #define shuffle(x) do { \ uint32_t r = x; \ x = (r & 0xff000000) >> 24; \ -@@ -154,12 +152,12 @@ +@@ -146,12 +141,12 @@ } for (int i = 0; i < len / _blksz; i++) { @@ -35,7 +38,7 @@ shuffle(*d); shuffle(*(d + 1)); #endif -@@ -178,12 +176,12 @@ +@@ -170,12 +165,12 @@ } for (int i = 0; i < len / _blksz; i++) { |