diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2018-07-05 15:07:22 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2018-07-05 15:07:22 -0700 |
| commit | da2c9c69641e966425732f6e67fa1171b4aea172 (patch) | |
| tree | 108efb10273298dff58de32bf7a6d221fcc3ef9c | |
| parent | Added patch for compiling with Qt 5.11 (diff) | |
| download | keepassxc-da2c9c69641e966425732f6e67fa1171b4aea172.tar.xz | |
Merged with upstream
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch (renamed from keepasspxc-2.3.3-Qt-5.11-fix.diff) | 4 |
2 files changed, 13 insertions, 11 deletions
@@ -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() { diff --git a/keepasspxc-2.3.3-Qt-5.11-fix.diff b/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch index 49a2fe1..c382db5 100644 --- a/keepasspxc-2.3.3-Qt-5.11-fix.diff +++ b/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch @@ -1,5 +1,5 @@ ---- /a/src/gui/entry/EditEntryWidget.cpp -+++ /b/src/gui/entry/EditEntryWidget.cpp +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp @@ -32,6 +32,7 @@ #include <QMimeData> #include <QEvent> |