Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/95c43e1afb4a87afbdec8810742d9bb929dc1295)

3 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d59870821b94..02eaf934e111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vdr
 	pkgdesc = 'open' digital satellite receiver and timer controlled video disk recorder
 	pkgver = 2.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://tvdr.de/
 	install = vdr.install
 	arch = x86_64
@@ -65,7 +65,7 @@ pkgbase = vdr
 	md5sums = 3565ca5ad9be5c75f66478f0796b120d
 	md5sums = dd20f932b846b5f50ac455b65e9432ad
 	md5sums = 7cad811b4ac5ee6c0b5496d006f1e0ee
-	md5sums = 1b81ba1063c3da92efd94b6251cdf65a
+	md5sums = 64979737d26758a75dda488b323c293c
 	md5sums = 59ce04d1d01bf92bf6cfc0b74223191c
 
 pkgname = vdr
diff --git a/PKGBUILD b/PKGBUILD
index f02f39bbe544..9940c8a407c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="'open' digital satellite receiver and timer controlled video disk recorder"
 url="http://tvdr.de/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -47,7 +47,7 @@ md5sums=('8853f64c0fc3d41ffd3b4bfc6f0a14b7'
          '3565ca5ad9be5c75f66478f0796b120d'
          'dd20f932b846b5f50ac455b65e9432ad'
          '7cad811b4ac5ee6c0b5496d006f1e0ee'
-         '1b81ba1063c3da92efd94b6251cdf65a'
+         '64979737d26758a75dda488b323c293c'
          '59ce04d1d01bf92bf6cfc0b74223191c')
 
 prepare() {
@@ -66,6 +66,7 @@ prepare() {
 
   sed -i '/define DEPRECATED_VIDEOSYSTEM/d' device.h
   sed -i '/define DEPRECATED_VDR_CHARSET_OVERRIDE/d' vdr.c
+  sed -i 's/libsystemd-daemon/libsystemd/g' Makefile
 }
 
 build() {
diff --git a/vdr.service b/vdr.service
index dc46fee63905..06845524ce43 100644
--- a/vdr.service
+++ b/vdr.service
@@ -7,6 +7,7 @@ After=xlogin@vdr.service
 [Service]
 Type=notify
 ExecStart=/usr/bin/vdr
+Environment=TERM=xterm
 Restart=on-failure
 RestartPreventExitStatus=2