diff options
| author | Maxqia | 2015-11-12 21:42:38 -0800 |
|---|---|---|
| committer | Maxqia | 2015-11-12 21:42:38 -0800 |
| commit | 903d22b5035f1ed75dc4260c5c37cd6f8b6090df (patch) | |
| tree | c35d1f36ca1c720c5e7b6ac5a2c206e06abe43e1 | |
| parent | de4c78c570ad48e3e4d9e951e4b3ff3d4d9c44af (diff) | |
| parent | 4d94b1596d30b66d76a7f2fb2cc511e50036357e (diff) | |
| download | aur-903d22b5035f1ed75dc4260c5c37cd6f8b6090df.tar.gz | |
Merge remote-tracking branch 'keepassx-git/master'
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 17 insertions, 9 deletions
@@ -1,6 +1,6 @@ pkgbase = keepassx-http pkgdesc = KeepassX, with eugenesan's merge request for keepasshttp. - pkgver = 2.0.alpha6.r235.gf076ad3 + pkgver = 2.0.beta2.r82.g6337e67 pkgrel = 1 url = https://github.com/eugenesan/keepassx/tree/http install = keepassx.install @@ -10,14 +10,16 @@ pkgbase = keepassx-http makedepends = git makedepends = intltool makedepends = cmake + makedepends = qt5-base + makedepends = qt5-tools makedepends = zlib makedepends = libgcrypt depends = libxtst - depends = qt4 depends = shared-mime-info - depends = qjson + depends = qt5-x11extras + depends = hicolor-icon-theme + depends = desktop-file-utils depends = libmicrohttpd - optdepends = libxtst: auto-type support conflicts = keepassx-svn conflicts = keepassx conflicts = keepassx2-git @@ -25,6 +27,7 @@ pkgbase = keepassx-http conflicts = keepassx2-yubikey-git conflicts = keepassx-http conflicts = keepassx-git + options = !emptydirs source = git+https://github.com/eugenesan/keepassx.git#branch=http md5sums = SKIP diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..7e61a0b672b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +keepassx-git-*.src.tar.gz +keepassx-git-*.pkg.tar.xz +keepassx/ +src/ +pkg/
\ No newline at end of file @@ -2,17 +2,17 @@ pkgname=keepassx-http _gitname=keepassx -pkgver=2.0.alpha6.r235.gf076ad3 +pkgver=2.0.beta2.r82.g6337e67 pkgrel=1 pkgdesc="KeepassX, with eugenesan's merge request for keepasshttp." arch=('i686' 'x86_64') url="https://github.com/eugenesan/keepassx/tree/http" license=('GPL2') -depends=('libxtst' 'qt4' 'shared-mime-info' 'qjson' 'libmicrohttpd') +depends=('libxtst' 'shared-mime-info' 'qt5-x11extras' 'hicolor-icon-theme' 'desktop-file-utils' 'libmicrohttpd') install=keepassx.install -makedepends=('git' 'intltool' 'cmake' 'zlib' 'libgcrypt') -optdepends=('libxtst: auto-type support') +makedepends=('git' 'intltool' 'cmake' 'qt5-base' 'qt5-tools' 'zlib' 'libgcrypt') conflicts=('keepassx-svn' 'keepassx' 'keepassx2-git' 'keepassx2' 'keepassx2-yubikey-git' 'keepassx-http' 'keepassx-git') +options=(!emptydirs) source=(git+https://github.com/eugenesan/keepassx.git#branch=http) md5sums=('SKIP') @@ -23,7 +23,7 @@ pkgver() { build() { cd "${_gitname}" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_BINDIR=/usr/bin -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_GUI_TESTS=ON + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_BINDIR=/usr/bin -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_VERBOSE_MAKEFILE=OFF -DWITH_GUI_TESTS=ON make } |