git » keepassxc.git » commit 571263f

Fix build with Qt 5.11 (FS#59219)

author Balló György
2018-07-05 06:59:09 UTC
committer Balló György
2018-07-05 06:59:09 UTC
parent f4139a5870274840ffae24acbbafeb1f291063ca

Fix build with Qt 5.11 (FS#59219)

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

diff --git a/PKGBUILD b/PKGBUILD
index 34db07e..c7ded0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,19 @@ 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})
+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')
+            'SKIP'
+            '89729d7f83b49583ca073fd913123b3b7ee399c4ac9f2ec32886604c03bd1408')
 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
new file mode 100644
index 0000000..c382db5
--- /dev/null
+++ b/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
@@ -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"