[arch-commits] Commit in vis/trunk (PKGBUILD)

[Christian Hesse]

    Date: Thursday, March 25, 2021 @ 07:42:08
  Author: eworm
Revision: 902611

upgpkg: vis 0.7-2: fix bash here-doc in lexer

Modified:
  vis/trunk/PKGBUILD

----------+
 PKGBUILD |   50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-25 07:41:17 UTC (rev 902610)
+++ PKGBUILD	2021-03-25 07:42:08 UTC (rev 902611)
@@ -3,7 +3,7 @@
 pkgname=vis
 _tag='b1bba35b097639865a4f2accc92194d9ce8e39e0' # git rev-parse v${pkgver}
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc='modern, legacy free, simple yet efficient vim-like editor'
 arch=('x86_64')
 url='https://github.com/martanne/vis#vis-a-vim-like-text-editor'
@@ -22,37 +22,55 @@
 sha256sums=('SKIP'
             'SKIP')
 
+_backports=(
+  # lexers: fix bug in bash lexer for last here-doc 
+  'e57851806592f5ea4ee48303b97a5f59731370c5'
+)
+
+_reverts=(
+)
+
 prepare() {
-	cd vis/
+  cd vis/
 
-	git config --file=.gitmodules submodule.test.url ../vis-test/
-	git update-index --assume-unchanged .gitmodules
-	git submodule init
-	git submodule update
+  git config --file=.gitmodules submodule.test.url ../vis-test/
+  git update-index --assume-unchanged .gitmodules
+  git submodule init
+  git submodule update
+  
+  local _c
+  for _c in "${_backports[@]}"; do
+    git log --oneline -1 "${_c}"
+    git cherry-pick -n "${_c}"
+  done
+  for _c in "${_reverts[@]}"; do
+    git log --oneline -1 "${_c}"
+    git revert -n "${_c}"
+  done
 }
 
 build() {
-	cd vis/
+  cd vis/
 
-	./configure \
-		--prefix=/usr
+  ./configure \
+    --prefix=/usr
 
-	make
+  make
 }
 
 check() {
-	cd vis/
+  cd vis/
 
-	make -C test/
+  make -C test/
 }
 
 package() {
-	cd vis/
+  cd vis/
 
-	make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 
-	install -D -m0644 lua/visrc.lua "${pkgdir}"/etc/vis/visrc.lua
+  install -D -m0644 lua/visrc.lua "${pkgdir}"/etc/vis/visrc.lua
 
-	install -D -m0644 'LICENSE' "${pkgdir}/usr/share/licenses/vis/LICENSE"
+  install -D -m0644 'LICENSE' "${pkgdir}/usr/share/licenses/vis/LICENSE"
 }