commit vis-standalone-git 0.2.r689.g0803eef-1

3 files changed, 4 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d2ea0fc279f..f37690b77d10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jan 19 14:03:29 UTC 2017
+# Thu Jan 19 15:47:25 UTC 2017
 pkgbase = vis-standalone-git
 	pkgdesc = modern, legacy free, simple yet efficient vim-like editor - statically linked - git checkout
-	pkgver = 0.2.r686.ge247d57
+	pkgver = 0.2.r689.g0803eef
 	pkgrel = 1
 	url = http://www.brain-dump.org/projects/vis/
 	arch = i686
@@ -26,7 +26,6 @@ pkgbase = vis-standalone-git
 	source = attr-2.4.47.tar.gz.sig::https://download.savannah.gnu.org/releases/attr/attr-2.4.47.src.tar.gz.sig
 	source = acl-2.2.52.tar.gz::https://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz
 	source = acl-2.2.52.tar.gz.sig::https://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz.sig
-	source = 0001-standalone-work-around-borked-dependencies-in-acl.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011
@@ -40,7 +39,6 @@ pkgbase = vis-standalone-git
 	sha256sums = SKIP
 	sha256sums = 179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23
 	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = vis-standalone-git
 	pkgdesc = modern, legacy free, simple yet efficient vim-like editor - statically linked - git checkout
diff --git a/0001-standalone-work-around-borked-dependencies-in-acl.patch b/0001-standalone-work-around-borked-dependencies-in-acl.patch
deleted file mode 100644
index 583bfd0ed0e1..000000000000
--- a/0001-standalone-work-around-borked-dependencies-in-acl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cc551cb0423a1de1e969174ad12a0b53191bab9b Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Thu, 19 Jan 2017 13:34:51 +0100
-Subject: [PATCH 1/1] standalone: work around borked dependencies in acl
-
-For any reason acl decides do build getfacl and setfacl on `make [...]
-install-lib install-dev`, which may fail. Make sure to not fail by
-installing from libacl and include subdirectories.
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- GNUmakefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 1a9bfa0..712a35d 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -201,7 +201,8 @@ dependency/build/libacl-build: dependency/build/libacl-configure
- 	touch $@
- 
- dependency/build/libacl-install: dependency/build/libacl-build
--	$(MAKE) -C $(dir $<)/$(LIBACL) DESTDIR=$(DEPS_ROOT) install-lib install-dev
-+	$(MAKE) -C $(dir $<)/$(LIBACL)/libacl DESTDIR=$(DEPS_ROOT) install-dev
-+	$(MAKE) -C $(dir $<)/$(LIBACL)/include DESTDIR=$(DEPS_ROOT) install-dev
- 	touch $@
- 
- # COMMON
--- 
-2.11.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 86824f6855b5..d46c1034c34f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=vis-standalone-git
 pkgname=(vis-standalone-git vis-single-git)
-pkgver=0.2.r686.ge247d57
+pkgver=0.2.r689.g0803eef
 pkgrel=1
 _pkgver_libmusl=1.1.16
 _pkgver_ncurses=6.0
@@ -32,8 +32,7 @@ source=('git://github.com/martanne/vis.git'
         "attr-${_pkgver_attr}.tar.gz::https://download.savannah.gnu.org/releases/attr/attr-${_pkgver_attr}.src.tar.gz"
         "attr-${_pkgver_attr}.tar.gz.sig::https://download.savannah.gnu.org/releases/attr/attr-${_pkgver_attr}.src.tar.gz.sig"
         "acl-${_pkgver_acl}.tar.gz::https://download.savannah.gnu.org/releases/acl/acl-${_pkgver_acl}.src.tar.gz"
-        "acl-${_pkgver_acl}.tar.gz.sig::https://download.savannah.gnu.org/releases/acl/acl-${_pkgver_acl}.src.tar.gz.sig"
-        '0001-standalone-work-around-borked-dependencies-in-acl.patch')
+        "acl-${_pkgver_acl}.tar.gz.sig::https://download.savannah.gnu.org/releases/acl/acl-${_pkgver_acl}.src.tar.gz.sig")
 sha256sums=('SKIP'
             'SKIP'
             '937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011'
@@ -46,7 +45,6 @@ sha256sums=('SKIP'
             '25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859'
             'SKIP'
             '179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23'
-            'SKIP'
             'SKIP')
 
 MAKEFLAGS="-j1"
@@ -65,8 +63,6 @@ prepare() {
 		SOURCE="$(basename ${SOURCE})"
 		ln -s ../../../${SOURCE} dependency/sources/${SOURCE}
 	done
-
-	patch -Np1 < ../0001-standalone-work-around-borked-dependencies-in-acl.patch
 }
 
 pkgver() {