diff options
author | Rafael Fontenelle | 2017-03-25 19:49:39 -0300 |
---|---|---|
committer | Rafael Fontenelle | 2017-03-25 19:57:11 -0300 |
commit | 2a1077d63206ed6e48c5824df992b45502da3bf2 (patch) | |
tree | ee8359e92c6202712ea13be35d7e9e74d86f82ad | |
parent | 6b3c6972fa51440c5cc8819433960a262da26abb (diff) | |
download | aur-2a1077d63206ed6e48c5824df992b45502da3bf2.tar.gz |
Fix build
Changes in this commit:
- removes intltool, as gettext is now used
- fixes pkgver function
- removes python 2.x fix as support for 3.x was implemented
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 16 |
2 files changed, 8 insertions, 18 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Oct 19 06:19:00 UTC 2016 +# Sat Mar 25 22:49:17 UTC 2017 pkgbase = gnome-commander-git pkgdesc = Graphical two-pane filemanager for GNOME - pkgver = 1.7.0.r27.ef2fd20 + pkgver = 1.7.0.r123.189b6a31 pkgrel = 1 url = http://gcmd.github.io/ arch = i686 @@ -10,13 +10,11 @@ pkgbase = gnome-commander-git license = GPL makedepends = perl-xml-parser makedepends = gnome-doc-utils - makedepends = intltool - makedepends = gnome-common makedepends = git depends = libgnomeui - depends = gnome-vfs + depends = gnome-vfs-nosmb depends = gconf - depends = python2 + depends = python depends = libsm depends = libunique provides = gnome-commander @@ -4,14 +4,14 @@ _name=gnome-commander pkgname=$_name-git -pkgver=1.7.0.r27.ef2fd20 +pkgver=1.7.0.r123.189b6a31 pkgrel=1 pkgdesc="Graphical two-pane filemanager for GNOME" arch=('i686' 'x86_64') url="http://gcmd.github.io/" license=('GPL') -depends=('libgnomeui' 'gnome-vfs-nosmb' 'gconf' 'python2' 'libsm' 'libunique') -makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool' 'gnome-common' 'git') +depends=('libgnomeui' 'gnome-vfs-nosmb' 'gconf' 'python' 'libsm' 'libunique') +makedepends=('perl-xml-parser' 'gnome-doc-utils' 'git') options=(!libtool) provides=($_name) conflicts=($_name) @@ -23,7 +23,7 @@ pkgver() { # git describe --tags | sed -e 's/-/./g' _tag=$(git describe --abbrev=0) - v=$(grep AC_INIT configure.ac | awk -F',' '{printf $2}' | sed 's/ //') + v=$(grep AC_INIT configure.ac | cut -d'[' -f3 | cut -d']' -f1) r="$(git rev-list --count $_tag..HEAD)" h="$(git rev-parse --short HEAD)" printf "$v.r$r.$h" @@ -31,16 +31,8 @@ pkgver() { build() { cd $_name - - # Python 2 fix - for f in doc/*/gnome-commander.xml; do - sed -i 's:env python$:env python2:' "$f" - done - export PYTHON=python2 #force python2 on configure procedures - ./autogen.sh --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper --enable-python - make } |