summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2018-06-19 14:31:43 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2018-06-19 14:31:43 -0700
commit6394a2b0f5ffaf8493020856eba4faafa7995c47 (patch)
tree774955d52dd03d42c137d31a4d86577863e18e5a
parentUpdated to 2.3.3 (diff)
downloadkeepassxc-6394a2b0f5ffaf8493020856eba4faafa7995c47.tar.xz
Added patch for compiling with Qt 5.11
-rw-r--r--PKGBUILD11
-rw-r--r--keepasspxc-2.3.3-Qt-5.11-fix.diff10
2 files changed, 18 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 7d37b7d..6a98c47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,25 @@
pkgname=keepassxc
pkgver=2.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="Cross-platform community-driven port of Keepass password manager"
arch=(x86_64 i686)
url="https://keepassxc.org/"
license=(GPL)
depends=(hicolor-icon-theme libgcrypt argon2 libxtst qt5-x11extras)
makedepends=(cmake qt5-tools)
-source=("https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"{,.sig})
+source=("https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"{,.sig}
+ "keepasspxc-2.3.3-Qt-5.11-fix.diff")
sha256sums=('cfff85ef89ba590aec798c59bea4aa3db00626d7bff8cdde0f62ee34aea60ad5'
- 'SKIP')
+ 'SKIP'
+ '5a3125f49e45127c5836d8892d056941097b4ae814f2497552871cb18c8300a8')
validpgpkeys=('BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2') # KeePassXC Release <release@keepassxc.org>
prepare() {
mkdir -p build
+
+ # Fix build on Qt 5.11
+ patch -p0 "${srcdir}/${pkgname}-${pkgver}/src/gui/entry/EditEntryWidget.cpp" "${srcdir}/keepasspxc-2.3.3-Qt-5.11-fix.diff"
}
build() {
diff --git a/keepasspxc-2.3.3-Qt-5.11-fix.diff b/keepasspxc-2.3.3-Qt-5.11-fix.diff
new file mode 100644
index 0000000..49a2fe1
--- /dev/null
+++ b/keepasspxc-2.3.3-Qt-5.11-fix.diff
@@ -0,0 +1,10 @@
+--- /a/src/gui/entry/EditEntryWidget.cpp
++++ /b/src/gui/entry/EditEntryWidget.cpp
+@@ -32,6 +32,7 @@
+ #include <QMimeData>
+ #include <QEvent>
+ #include <QColorDialog>
++#include <QButtonGroup>
+
+ #include "autotype/AutoType.h"
+ #include "core/Config.h"