Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/70f545084cce4953e62b984927e861b2efbcf4e4)

5 files changed, 32 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 095ecf3d3db2..8d80571d0c89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.2.2
-# Sun Aug  2 17:28:57 UTC 2020
+# Fri Sep  4 18:26:14 UTC 2020
 pkgbase = vdr-bgprocess
 	pkgdesc = Displays information about background processes
 	pkgver = 0.1.0
-	pkgrel = 24
+	pkgrel = 25
 	url = http://www.vdr-wiki.de/wiki/index.php/Bgprocess-plugin
 	arch = x86_64
 	arch = i686
@@ -15,11 +15,13 @@ pkgbase = vdr-bgprocess
 	depends = vdr-api=2.4.3
 	backup = etc/vdr/conf.avail/50-bgprocess.conf
 	source = http://ftp.uni-kl.de/pub/linux/gentoo/distfiles/vdr-bgprocess-0.1.0.tgz
-	source = bgprocess-tlphrases-fix.diff
-	source = bgprocess-osditem-fix.diff
-	md5sums = 46bc8626cf843110eedef74d2dc27c3d
-	md5sums = d2f7efb1ab40727298d4d17e1b07e37c
-	md5sums = 1556e199ab90264a1f45838abbef0243
+	source = vdr-bgprocess-01_locale.patch
+	source = vdr-bgprocess-03_tlphrases.patch
+	source = vdr-bgprocess-04_osditem.patch
+	sha256sums = 79612020bda0cf59265ceea9898a3a73179ee8caed44fbb9b259d0e52f7fa91f
+	sha256sums = c5e6260d26a169d8d37dc9226b79b6e00806ad5ebda5227f1466f243f9d940a6
+	sha256sums = 344622c47c7e995b19431fb14bb2ca986a1635ed4b0522a814771e53d9c52590
+	sha256sums = 9305299e91a0ba3b655fe5c452f2d36fc36a211fa67a3101313cc6e3241e5d90
 
 pkgname = vdr-bgprocess
 
diff --git a/PKGBUILD b/PKGBUILD
index 941e5a2b50d2..326899f17c3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=vdr-bgprocess
 pkgver=0.1.0
 _vdrapi=2.4.3
-pkgrel=24
+pkgrel=25
 pkgdesc="Displays information about background processes"
 url="http://www.vdr-wiki.de/wiki/index.php/Bgprocess-plugin"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -12,18 +12,21 @@ license=('GPL2')
 depends=('gcc-libs' "vdr-api=${_vdrapi}")
 _plugname=${pkgname//vdr-/}
 source=("http://ftp.uni-kl.de/pub/linux/gentoo/distfiles/$pkgname-$pkgver.tgz"
-        'bgprocess-tlphrases-fix.diff'
-        'bgprocess-osditem-fix.diff')
+        "$pkgname-01_locale.patch"
+        "$pkgname-03_tlphrases.patch"
+        "$pkgname-04_osditem.patch")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-md5sums=('46bc8626cf843110eedef74d2dc27c3d'
-         'd2f7efb1ab40727298d4d17e1b07e37c'
-         '1556e199ab90264a1f45838abbef0243')
+sha256sums=('79612020bda0cf59265ceea9898a3a73179ee8caed44fbb9b259d0e52f7fa91f'
+            'c5e6260d26a169d8d37dc9226b79b6e00806ad5ebda5227f1466f243f9d940a6'
+            '344622c47c7e995b19431fb14bb2ca986a1635ed4b0522a814771e53d9c52590'
+            '9305299e91a0ba3b655fe5c452f2d36fc36a211fa67a3101313cc6e3241e5d90')
 
 prepare() {
   cd "${srcdir}/${_plugname}-${pkgver}"
 
-  patch -p1 -i ${srcdir}/bgprocess-tlphrases-fix.diff #By Holger Schvestka (yaVDR)
-  patch -p1 -i ${srcdir}/bgprocess-osditem-fix.diff #By Holger Schestka (yaVDR)
+  patch -p1 -i "${srcdir}/$pkgname-01_locale.patch"
+  patch -p1 -i "${srcdir}/$pkgname-03_tlphrases.patch" #By Holger Schvestka (yaVDR)
+  patch -p1 -i "${srcdir}/$pkgname-04_osditem.patch" #By Holger Schestka (yaVDR)
 }
 
 package() {
diff --git a/vdr-bgprocess-01_locale.patch b/vdr-bgprocess-01_locale.patch
new file mode 100644
index 000000000000..ec14b8391062
--- /dev/null
+++ b/vdr-bgprocess-01_locale.patch
@@ -0,0 +1,12 @@
+diff -urNad bgprocess-0.1.0~/Makefile bgprocess-0.1.0/Makefile
+--- bgprocess-0.1.0~/Makefile	2009-10-01 00:17:28.000000000 +0200
++++ bgprocess-0.1.0/Makefile	2009-10-01 00:20:59.820122611 +0200
+@@ -29,7 +29,7 @@
+ -include $(VDRDIR)/Make.config
+ 
+ ### Test whether VDR has locale support
+-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
++VDRLOCALE = $(shell grep 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h)
+ 
+ ### The version number of VDR's plugin API (taken from VDR's "config.h"):
+ 
diff --git a/bgprocess-tlphrases-fix.diff b/vdr-bgprocess-03_tlphrases.patch
index 01e5cc7f124a..01e5cc7f124a 100644
--- a/bgprocess-tlphrases-fix.diff
+++ b/vdr-bgprocess-03_tlphrases.patch
diff --git a/bgprocess-osditem-fix.diff b/vdr-bgprocess-04_osditem.patch
index 56b91f7cde92..56b91f7cde92 100644
--- a/bgprocess-osditem-fix.diff
+++ b/vdr-bgprocess-04_osditem.patch