[arch-commits] Commit in keepassxc (4 files)

[Balló György]

    Date: Thursday, July 5, 2018 @ 06:59:09
  Author: bgyorgy
Revision: 352278

Fix build with Qt 5.11 (FS#59219)

Added:
  keepassxc/repos/community-x86_64/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
  keepassxc/trunk/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
Modified:
  keepassxc/repos/community-x86_64/PKGBUILD
  keepassxc/trunk/PKGBUILD

---------------------------------------------------------------------------------+
 repos/community-x86_64/PKGBUILD                                                 |   10 ++++++++--
 repos/community-x86_64/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch |   10 ++++++++++
 trunk/PKGBUILD                                                                  |   10 ++++++++--
 trunk/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch                  |   10 ++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

Modified: repos/community-x86_64/PKGBUILD
===================================================================
--- repos/community-x86_64/PKGBUILD	2018-07-05 02:21:50 UTC (rev 352277)
+++ repos/community-x86_64/PKGBUILD	2018-07-05 06:59:09 UTC (rev 352278)
@@ -11,13 +11,19 @@
 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 at 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() {

Added: repos/community-x86_64/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
===================================================================
--- repos/community-x86_64/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch	                        (rev 0)
+++ repos/community-x86_64/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch	2018-07-05 06:59:09 UTC (rev 352278)
@@ -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"

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2018-07-05 02:21:50 UTC (rev 352277)
+++ trunk/PKGBUILD	2018-07-05 06:59:09 UTC (rev 352278)
@@ -11,13 +11,19 @@
 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 at 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() {

Added: trunk/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
===================================================================
--- trunk/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch	                        (rev 0)
+++ trunk/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch	2018-07-05 06:59:09 UTC (rev 352278)
@@ -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"