summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxqia2016-04-16 04:46:22 -0700
committerMaxqia2016-04-16 04:49:29 -0700
commit7759becbeab1a341dd7a3908077b760045a816ce (patch)
tree2a7102b6b0be8bb4d6cd7aed9fd2161ef4f39643
parent80c79fd9f2a5a14da87f02e94250450c44088686 (diff)
downloadaur-7759becbeab1a341dd7a3908077b760045a816ce.tar.gz
Update to 2.0.2 and change repositories
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD38
2 files changed, 33 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5b7cb7facb20..4b0c41733fc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Sun Jan 10 19:19:55 UTC 2016
+# Sat Apr 16 11:44:27 UTC 2016
pkgbase = keepassx-http
- pkgdesc = KeepassX, with eugenesan's merge request for keepasshttp.
- pkgver = 2.0.alpha6.r252.g279c329
+ pkgdesc = KeepassX, with the proposed keepasshttp support.
+ pkgver = 2.0.2.r165.gcbb1269
pkgrel = 1
- url = https://github.com/eugenesan/keepassx/tree/http
+ url = https://github.com/keepassx/keepassx/pull/111
install = keepassx.install
arch = i686
arch = x86_64
@@ -21,18 +21,15 @@ pkgbase = keepassx-http
depends = qt5-x11extras
depends = hicolor-icon-theme
depends = desktop-file-utils
- depends = qjson
depends = libmicrohttpd
- depends = oath-toolkit
conflicts = keepassx-svn
conflicts = keepassx
- conflicts = keepassx2-git
+ conflicts = keepassx-git
conflicts = keepassx2
+ conflicts = keepassx2-git
conflicts = keepassx2-yubikey-git
- conflicts = keepassx-http
- conflicts = keepassx-git
options = !emptydirs
- source = git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp
+ source = git+https://github.com/droidmonkey/keepassx_http.git
md5sums = SKIP
pkgname = keepassx-http
diff --git a/PKGBUILD b/PKGBUILD
index 55740d3fddee..b4d303784b75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
# Maintainer: Maxqia contrib@maxqia.com
pkgname=keepassx-http
-_gitname=keepassx
-pkgver=2.0.alpha6.r252.g279c329
+_gitname=keepassx_http
+pkgver=2.0.2.r165.gcbb1269
pkgrel=1
-pkgdesc="KeepassX, with eugenesan's merge request for keepasshttp."
+pkgdesc="KeepassX, with the proposed keepasshttp support."
arch=('i686' 'x86_64')
-url="https://github.com/eugenesan/keepassx/tree/http"
+url="https://github.com/keepassx/keepassx/pull/111"
license=('GPL2')
-depends=('libxtst' 'shared-mime-info' 'qjson' 'libmicrohttpd' 'oath-toolkit')
+depends=('libxtst' 'shared-mime-info' 'qt5-x11extras' 'hicolor-icon-theme' 'desktop-file-utils' 'libmicrohttpd')
install=keepassx.install
makedepends=('git' 'intltool' 'cmake' 'qt5-base' 'qt5-tools' 'zlib' 'libgcrypt')
-conflicts=('keepassx-svn' 'keepassx' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' 'keepassx-git')
+conflicts=('keepassx-svn' 'keepassx' 'keepassx-git' 'keepassx2' 'keepassx2-git' 'keepassx2-yubikey-git')
options=(!emptydirs)
-source=(git+https://github.com/eugenesan/keepassx.git#branch=2.0-http-totp)
+source=(git+https://github.com/droidmonkey/keepassx_http.git)
md5sums=('SKIP')
pkgver() {
@@ -21,15 +21,29 @@ pkgver() {
git describe --long | sed 's/^FOO-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
+prepare() {
+ cd ${_gitname}
+ mkdir -p build
+}
+
build() {
- cd "${_gitname}"
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_BINDIR=/usr/bin -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_VERBOSE_MAKEFILE=OFF -DWITH_GUI_TESTS=ON
+ cd "${_gitname}/build"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_BINDIR=/usr/bin \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_VERBOSE_MAKEFILE=OFF \
+ -DWITH_GUI_TESTS=ON \
+ -DCMAKE_BUILD_TYPE=Release ..
make
}
+#check() {
+# cd "${_gitname}/build"
+# make test
+#}
+
package() {
- cd "${_gitname}"
- make PREFIX=/usr DESTDIR="${pkgdir}" install
+ cd "${_gitname}/build"
+ make DESTDIR="${pkgdir}" install
}
-