git » keepassxc.git » commit 9dd5660

upgpkg: 2.3.4-1

author Bruno Pagani
2018-08-23 20:35:55 UTC
committer Bruno Pagani
2018-08-23 20:35:55 UTC
parent 571263f2f90f210af3829848b191e64b6afcf619

upgpkg: 2.3.4-1

PKGBUILD +4 -10
keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch +0 -10

diff --git a/PKGBUILD b/PKGBUILD
index c7ded0d..5e1a7d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bruno Pagani <archange@archlinux.org>
 
 pkgname=keepassxc
-pkgver=2.3.3
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="Cross-platform community-driven port of Keepass password manager"
 arch=(x86_64)
@@ -10,19 +10,13 @@ url="https://keepassxc.org/"
 license=(GPL)
 depends=(hicolor-icon-theme libgcrypt argon2 libsodium libxtst qt5-x11extras yubikey-personalization curl)
 makedepends=(cmake qt5-tools)
-source=("https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"{,.sig}
-        "keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch")
-sha256sums=('cfff85ef89ba590aec798c59bea4aa3db00626d7bff8cdde0f62ee34aea60ad5'
-            'SKIP'
-            '89729d7f83b49583ca073fd913123b3b7ee399c4ac9f2ec32886604c03bd1408')
+source=("https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"{,.sig})
+sha256sums=('0c24a78895185b9b6b098f08a15b332c600f80aa570d608940fcc2a38e02780a'
+            'SKIP')
 validpgpkeys=('BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2') # KeePassXC Release <release@keepassxc.org>
 
 prepare() {
 	mkdir -p build
-
-	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() {
diff --git a/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
deleted file mode 100644
index c382db5..0000000
--- a/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"