Date: Sunday, March 26, 2017 @ 12:51:02 Author: eworm Revision: 219075
upgpkg: vis 0.3-1 new upstream release Modified: vis/trunk/PKGBUILD Deleted: vis/trunk/pie.patch -----------+ PKGBUILD | 31 +++++++++++++++++++------------ pie.patch | 13 ------------- 2 files changed, 19 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-26 12:40:51 UTC (rev 219074) +++ PKGBUILD 2017-03-26 12:51:02 UTC (rev 219075) @@ -2,23 +2,26 @@ # Maintainer: Christian Hesse <m...@eworm.de> pkgname=vis -pkgver=0.2 -pkgrel=2 +pkgver=0.3 +pkgrel=1 +_pkgname_test=vis-test +_pkgver_test=0.1 pkgdesc='modern, legacy free, simple yet efficient vim-like editor' arch=('i686' 'x86_64') url='http://www.brain-dump.org/projects/vis/' -depends=('ncurses' 'libtermkey' 'lua' 'lua-lpeg') -makedepends=('markdown') +depends=('ncurses' 'libtermkey' 'lua' 'lua-lpeg' 'tre' 'file') license=('custom:ISC') -source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'pie.patch') -sha256sums=('3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d' - '90afe9c335f41490d572e1107394c126564d85b42e027df1f7c5e61098dbd603') +backup=('etc/vis/visrc.lua') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/martanne/${pkgname}/archive/v${pkgver}.tar.gz" + "${_pkgname_test}-${_pkgver_test}.tar.gz::https://github.com/martanne/${_pkgname_test}/archive/v${_pkgver_test}.tar.gz") +sha256sums=('bed8ed32ef4f81bc4fd28e297ea8edc80027ac6923b9d3b5bd955d24899c7077' + '78c2c4416ef284e2362bb0e761ee9c4add106d122ac44b341c6bcf449f0b17a6') prepare() { cd "${pkgname}-${pkgver}/" - patch -Np1 < "${srcdir}/pie.patch" + rmdir test/ + mv "../${_pkgname_test}-${_pkgver_test}" test } build() { @@ -28,8 +31,12 @@ --prefix=/usr make +} - markdown README.md > README.html +check() { + cd "${pkgname}-${pkgver}/" + + make -C test/ } package() { @@ -37,8 +44,8 @@ make DESTDIR="${pkgdir}" install + install -D -m0644 lua/visrc.lua "${pkgdir}"/etc/vis/visrc.lua + install -D -m0644 'LICENSE' "${pkgdir}/usr/share/licenses/vis/LICENSE" - install -D -m0644 'README.md' "${pkgdir}/usr/share/doc/vis/README.md" - install -D -m0644 'README.html' "${pkgdir}/usr/share/doc/vis/README.html" } Deleted: pie.patch =================================================================== --- pie.patch 2017-03-26 12:40:51 UTC (rev 219074) +++ pie.patch 2017-03-26 12:51:02 UTC (rev 219075) @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index d3c59ac..34da035 100755 ---- a/configure -+++ b/configure -@@ -223,7 +223,7 @@ tryflag CFLAGS_AUTO -fPIE - tryflag CFLAGS_AUTO -fstack-protector-all - tryldflag LDFLAGS_AUTO -Wl,-z,now - tryldflag LDFLAGS_AUTO -Wl,-z,relro --tryldflag LDFLAGS_AUTO -Wl,-pie -+tryldflag LDFLAGS_AUTO -pie - - have_pkgconfig=no - printf "checking for pkg-config... "