From da2c9c69641e966425732f6e67fa1171b4aea172 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 5 Jul 2018 15:07:22 -0700
Subject: Merged with upstream

---
 PKGBUILD | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 6a98c47..105dd36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,37 @@
 # $Id$
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
 
 pkgname=keepassxc
 pkgver=2.3.3
-pkgrel=2
+pkgrel=1
 pkgdesc="Cross-platform community-driven port of Keepass password manager"
-arch=(x86_64 i686)
+arch=(x86_64)
 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}
-        "keepasspxc-2.3.3-Qt-5.11-fix.diff")
+        "keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch")
 sha256sums=('cfff85ef89ba590aec798c59bea4aa3db00626d7bff8cdde0f62ee34aea60ad5'
             'SKIP'
-            '5a3125f49e45127c5836d8892d056941097b4ae814f2497552871cb18c8300a8')
+            '89729d7f83b49583ca073fd913123b3b7ee399c4ac9f2ec32886604c03bd1408')
 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"
+	cd $pkgname-$pkgver
+	# Fix build with Qt 5.11
+	patch -Np1 -i ../keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
 }
 
 build() {
 	cd build
 	cmake ../$pkgname-$pkgver \
-		-DCMAKE_BUILD_TYPE=Release  \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib  \
+		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DWITH_XC_AUTOTYPE=ON       \
 		-DWITH_XC_BROWSER=OFF       \
 		-DWITH_XC_HTTP=OFF          \
@@ -44,7 +46,7 @@ build() {
 
 check() {
 	cd build
- make test
+	make test
 }
 
 package() {
-- 
cgit v1.2.1