Replace old sys_siglist by strsignal

2 files changed, 20 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90c3c9aa2519..54d63d0d27d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xawtv
 	pkgdesc = A simple Xaw-based TV program which uses the bttv driver or video4linux
 	pkgver = 3.107
-	pkgrel = 1
+	pkgrel = 2
 	url = https://git.linuxtv.org/xawtv3.git
 	arch = x86_64
 	license = GPL
@@ -21,7 +21,7 @@ pkgbase = xawtv
 	depends = libxaw
 	depends = xorg-fonts-misc
 	depends = libxxf86vm
-	source = git+https://git.linuxtv.org/cgit.cgi/xawtv3.git#commit=8e3feea862db68d3ca0886f46cd99fab45d2db7c
-	md5sums = SKIP
+	source = git+https://git.linuxtv.org/xawtv3.git#commit=8e3feea862db68d3ca0886f46cd99fab45d2db7c
+	sha512sums = SKIP
 
 pkgname = xawtv
diff --git a/PKGBUILD b/PKGBUILD
index a6e7bfd627cc..3fa39de3721c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,36 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Jason Chu <jason@archlinux.org>
+# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
+# Contributor: Antonio Rojas <arojas@archlinux.org>
 
 pkgname=xawtv
 pkgver=3.107
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux"
-arch=('x86_64')
-url="https://git.linuxtv.org/xawtv3.git"
-license=('GPL')
-depends=('aalib' 'v4l-utils' 'libxv' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm')
-makedepends=('mesa' 'git' 'xorgproto')
+arch=(x86_64)
+url="https://git.linuxtv.org/${pkgname}3.git"
+license=(GPL)
+depends=(aalib v4l-utils libxv libxrandr libgl libdv zvbi libxinerama lirc libxft libxaw xorg-fonts-misc libxxf86vm)
+makedepends=(mesa git xorgproto)
 _commit=8e3feea862db68d3ca0886f46cd99fab45d2db7c
-source=("git+https://git.linuxtv.org/cgit.cgi/xawtv3.git#commit=$_commit")
-md5sums=('SKIP')
-
-pkgver() {
-  cd xawtv3
-  git describe --tags | sed 's/^xawtv-//;s/-/+/g'
-}
+source=("git+${url}#commit=${_commit}")
+sha512sums=('SKIP')
 
 prepare() {
-  cd xawtv3
+  # sys_siglist deprecated, see https://man.archlinux.org/man/core/man-pages/sys_siglist.3.en
+  sed -i 's/sys_siglist\[termsig\]/strsignal(termsig)/' ${pkgname}3/x11/rootv.c
+  sed -i 's/sys_siglist\[signal\]/strsignal(signal)/' ${pkgname}3/console/record.c
+  sed -i 's/sys_siglist\[termsig\]/strsignal(termsig)/' ${pkgname}3/console/fbtools.c
+  cd ${pkgname}3
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "${srcdir}/xawtv3"
+  cd ${pkgname}3
   CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
   ./configure --prefix=/usr --disable-motif --disable-quicktime
   make
 }
 
 package() {
-  cd "${srcdir}/xawtv3"
+  cd ${pkgname}3
   make DESTDIR="${pkgdir}" install
 }