aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2017-04-20 08:08:50 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2017-04-20 08:09:10 +0000
commit71198029dc35e993f75794a334d9fec2a2dd9c6c (patch)
tree4bb3aa5c853eb1aa1a37434ecdf25653144024ef
parent852880432e22d91d3d3947768c77b09087a9d774 (diff)
downloadaports-71198029dc35e993f75794a334d9fec2a2dd9c6c.tar.bz2
aports-71198029dc35e993f75794a334d9fec2a2dd9c6c.tar.xz
testing/keepassx: upgrade to 2.0.3, add check()
-rw-r--r--testing/keepassx/APKBUILD44
-rw-r--r--testing/keepassx/musl-fixes.patch10
2 files changed, 35 insertions, 19 deletions
diff --git a/testing/keepassx/APKBUILD b/testing/keepassx/APKBUILD
index 1909dafa40..9d71ceea9e 100644
--- a/testing/keepassx/APKBUILD
+++ b/testing/keepassx/APKBUILD
@@ -1,36 +1,42 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=keepassx
-pkgver=0.4.4
+pkgver=2.0.3
pkgrel=0
pkgdesc="A password manager"
url="http://www.keepassx.org"
arch="all"
license="GPL2"
-depends=""
-depends_dev="qt-dev libxtst-dev"
-makedepends="$depends_dev"
-install=""
-subpackages=""
+makedepends="cmake qt-dev libxtst-dev libgcrypt-dev"
source="http://www.keepassx.org/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz
- add_unistd.patch"
+ musl-fixes.patch
+ "
+builddir="$srcdir"/$pkgname-$pkgver
-builddir=$srcdir/${pkgname}-${pkgver}
+prepare() {
+ cd "$builddir"
+ mkdir build
+ default_prepare
+}
build() {
- cd "$builddir"
- qmake || return 1
- make || return 1
+ cd "$builddir"/build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+}
+
+check() {
+ cd "$builddir"/build
+ make test
}
package() {
- cd "$builddir"
- make INSTALL_ROOT="$pkgdir" install || return 1
+ cd "$builddir"/build
+ make DESTDIR="$pkgdir" install
}
-md5sums="6022ffe1e2c59fc6f1a47544417bb0b5 keepassx-0.4.4.tar.gz
-39f4f94d468427f902724a8355b9a3fe add_unistd.patch"
-sha256sums="3e27068ca85e68705347f0921c6b3c9248d7c5a84c79c0483daf22d141c0adc4 keepassx-0.4.4.tar.gz
-16720665a5d3f2eedf9ee04612542ecb38546892b0d8bb5a0df9b53b105d2ab0 add_unistd.patch"
-sha512sums="2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8 keepassx-0.4.4.tar.gz
-6adbe43e0a39c3d1436601fb3c89daaf726b9c477b673e4d6fb58bf84ce56de3b51e73f5d222128e86124dd3ee000e828b97b78e89366192bca7b6fb923cb0d1 add_unistd.patch"
+sha512sums="bf1a4ffa49fc4a6b7a27e6292981c9c13920712b4cd86759a99976f7e0593a243ea14575c57d664ba7e55d2449b5d83bc3d43a64a9a6972335e52234da79d773 keepassx-2.0.3.tar.gz
+f393ce341eb6941bfb808369f076585536802284ab7ee6034a26284dc70bbf168f4a89dc676357334e30a527a5593cb1b20cabb4e699ae806ca9e229ac6cffdd musl-fixes.patch"
diff --git a/testing/keepassx/musl-fixes.patch b/testing/keepassx/musl-fixes.patch
new file mode 100644
index 0000000000..5afb7ed7c8
--- /dev/null
+++ b/testing/keepassx/musl-fixes.patch
@@ -0,0 +1,10 @@
+--- a/src/core/qlockfile_unix.cpp.orig 2015-07-19 00:41:35.000000000 +0200
++++ b/src/core/qlockfile_unix.cpp 2015-07-21 20:01:02.607722077 +0200
+@@ -39,6 +39,7 @@
+ #include <QDebug>
+ #include <QDateTime>
+
++#include <fcntl.h>
+ #include <sys/file.h> // flock
+ #include <sys/types.h> // kill
+ #include <signal.h> // kill