From bd76a235fb46e62376bd2d74481343ffee094d0b Mon Sep 17 00:00:00 2001
From: Sören Tempel <soeren+git@soeren-tempel.net>
Date: Sun, 7 Jun 2020 13:41:00 +0200
Subject: community/vis: upgrade to 0.6

---
 community/vis/APKBUILD             | 24 +++++++++---------------
 community/vis/fortify-source.patch | 16 ----------------
 2 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 community/vis/fortify-source.patch

diff --git a/community/vis/APKBUILD b/community/vis/APKBUILD
index 5eb584514a1..045269af886 100644
--- a/community/vis/APKBUILD
+++ b/community/vis/APKBUILD
@@ -1,28 +1,23 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=vis
-pkgver=0.5
-_testver=0.3
+pkgver=0.6
+_testver=0.4
 pkgrel=0
 pkgdesc="Modern, legacy free, simple yet efficient vim-like editor"
 url="https://github.com/martanne/vis"
 arch="all"
 license="ISC"
 depends="!outils-vis lua5.3-lpeg"
-depends_dev=""
 makedepends="libtermkey-dev ncurses-dev acl-dev lua5.3-dev"
 checkdepends="vim"
-install=""
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/martanne/$pkgname/archive/v$pkgver.tar.gz
-	$pkgname-test-$pkgver.tar.gz::https://github.com/martanne/$pkgname-test/archive/v$_testver.tar.gz
-	fortify-source.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/martanne/vis/archive/v$pkgver.tar.gz
+	$pkgname-test-$pkgver.tar.gz::https://github.com/martanne/vis-test/archive/v$_testver.tar.gz
 	"
 _testdir="$srcdir"/$pkgname-test-$_testver
-builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--enable-lua \
@@ -31,14 +26,13 @@ build() {
 }
 
 check() {
-	cp -r "$_testdir"/* "$builddir"/test/
-	make -C "$builddir" test
+	cp -r "$_testdir"/* ./test/
+	make test
 }
 
 package() {
-	make -C "$builddir" DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e6ee7228c13d26342a4fb7884412c018118199a809cf18985eaa48232081fad0d7110364e55937e71e139bbe2cd24c2964d801e64f078d7ba7f2a999eeef72cc  vis-0.5.tar.gz
-5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5  vis-test-0.5.tar.gz
-fbcb897cb7d8cdfdc1f647691bbe23b383901a3dc9af97e2218cac18da72535ec4d138998d6016d5424e5882e15236fe13909509ca50c387227aecd2071acb9d  fortify-source.patch"
+sha512sums="3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2  vis-0.6.tar.gz
+446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5  vis-test-0.6.tar.gz"
diff --git a/community/vis/fortify-source.patch b/community/vis/fortify-source.patch
deleted file mode 100644
index 12a3608ff4b..00000000000
--- a/community/vis/fortify-source.patch
+++ /dev/null
@@ -1,16 +0,0 @@
--D_FORTIFY_SOURCE=2 is enable in gcc by default on alpine. See the
-010_all_default-fortify-source.patch patch in main/gcc. Disabling
-it here silences a bunch of compiler warnings.
-
-diff -upr vis-0.2.orig/configure vis-0.2/configure
---- vis-0.2.orig/configure	2016-04-06 23:36:44.232477390 +0200
-+++ vis-0.2/configure	2016-04-06 23:36:59.705671155 +0200
-@@ -220,7 +220,7 @@ tryflag   CFLAGS_TRY  -Werror=unused-com
- tryldflag LDFLAGS_TRY -Werror=unknown-warning-option
- tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument
- 
--CFLAGS_STD="-std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DNDEBUG -D_FORTIFY_SOURCE=2"
-+CFLAGS_STD="-std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DNDEBUG"
- LDFLAGS_STD="-lc"
- 
- OS=$(uname)
-- 
cgit v1.2.3