From 45e41a50aecde1b434449d3c665e8f98ec9736e0 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 9 Jan 2018 01:45:09 -0600
Subject: user/kwallet: Fix endianness issue again

---
 user/kwallet/APKBUILD                              |  8 ++--
 .../kwallet-5.22.0-blowfish-endianness.patch       | 52 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 user/kwallet/kwallet-5.22.0-blowfish-endianness.patch

diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD
index 53cda14f4..9ff904ab5 100644
--- a/user/kwallet/APKBUILD
+++ b/user/kwallet/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kwallet
 pkgver=5.41.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Secure storage system for passwords built atop Qt"
 url="https://www.kde.org/"
 arch="all"
@@ -14,7 +14,8 @@ depends_dev="qt5-qtbase-dev kcoreaddons-dev kconfig-dev kwindowsystem-dev
 makedepends="$depends_dev cmake extra-cmake-modules kdoctools-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kwallet-$pkgver.tar.xz"
+source="http://download.kde.org/stable/frameworks/${pkgver%.*}/kwallet-$pkgver.tar.xz
+	kwallet-5.22.0-blowfish-endianness.patch"
 builddir="$srcdir/kwallet-$pkgver"
 
 build() {
@@ -43,4 +44,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74  kwallet-5.41.0.tar.xz"
+sha512sums="572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74  kwallet-5.41.0.tar.xz
+edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179  kwallet-5.22.0-blowfish-endianness.patch"
diff --git a/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch
new file mode 100644
index 000000000..9d76cc25c
--- /dev/null
+++ b/user/kwallet/kwallet-5.22.0-blowfish-endianness.patch
@@ -0,0 +1,52 @@
+--- 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 @@
+ 
+ #include "blowfishtables.h"
+ 
+-// DO NOT INCLUDE THIS. IT BREAKS KWALLET.
+-// 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
+ 
+ BlowFish::BlowFish()
+ {
+@@ -135,7 +133,7 @@
+     return init();
+ }
+ 
+-#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 @@
+     }
+ 
+     for (int i = 0; i < len / _blksz; i++) {
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+         shuffle(*d);
+         shuffle(*(d + 1));
+ #endif
+         encipher(d, d + 1);
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+         shuffle(*d);
+         shuffle(*(d + 1));
+ #endif
+@@ -178,12 +176,12 @@
+     }
+ 
+     for (int i = 0; i < len / _blksz; i++) {
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+         shuffle(*d);
+         shuffle(*(d + 1));
+ #endif
+         decipher(d, d + 1);
+-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
+         shuffle(*d);
+         shuffle(*(d + 1));
+ #endif
-- 
cgit v1.2.3-70-g09d2