diff options
Diffstat (limited to 'user/kwallet')
| -rw-r--r-- | user/kwallet/APKBUILD | 11 | ||||
| -rw-r--r-- | user/kwallet/kwallet-5.22.0-blowfish-endianness.patch | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 910635c7a..0e89dfb47 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.54.0 +pkgver=5.94.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -18,7 +18,6 @@ source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwallet-$pkgver. kwallet-5.22.0-blowfish-endianness.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,19 +29,17 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f30ceda97180a562853923a0ad1cefbadbed51bbbf4b29405bbe85ccae3dc815053903367ba3638e7a7293eda7fbb7df88f527d6176fc6c2286088c38ce0069a kwallet-5.54.0.tar.xz -edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" +sha512sums="9cb0105413d983bf89819f60fc36182cbb59737be316ce52262fe68f388dc1262dfb404ef0703af48ec75bd869985829f67b58f433f6b366ef780ad553ee9638 kwallet-5.94.0.tar.xz +5aea35d4b1e706c6712c8e2a2ab4bb243ad0c215e677ac922226bc95602112111dbd9675d42184a88dced60f1f700c8ac18eba60e48f068b4b642e0b6189d78f 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 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++) { |