diff options
| author | Christopher Reimer | 2016-08-17 18:25:13 +0200 |
|---|---|---|
| committer | Christopher Reimer | 2016-08-17 18:25:13 +0200 |
| commit | bf6a36e1c13a2421e9aff014280cb8cff539096e (patch) | |
| tree | af70991100f421b74146704d8276e47543b87afb | |
| parent | d102e2e4b83c1698b7ced2f5be12aa82b8ca609e (diff) | |
| download | aur-bf6a36e1c13a2421e9aff014280cb8cff539096e.tar.gz | |
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/5e0ebb8f54bac7bf51094d99fe397f82ea30e2a4)
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | externalplayer-fix-operator-mismatch.diff | 16 |
3 files changed, 31 insertions, 4 deletions
@@ -1,7 +1,9 @@ +# Generated by makepkg 5.0.1 +# Wed Aug 17 16:25:13 UTC 2016 pkgbase = vdr-externalplayer pkgdesc = use external players in VDR pkgver = 0.3.2 - pkgrel = 16 + pkgrel = 17 url = http://www.uli-eckhardt.de/vdr/external.en.shtml arch = x86_64 arch = i686 @@ -15,8 +17,10 @@ pkgbase = vdr-externalplayer backup = var/lib/vdr/plugins/externalplayer.conf source = http://www.uli-eckhardt.de/vdr/download/vdr-externalplayer-0.3.2.tgz source = 50-externalplayer.conf + source = externalplayer-fix-operator-mismatch.diff md5sums = fe51ca255507db0ea4d4bc45ee43aee9 md5sums = 4e40f42e1d1f54ea98dc8004fe79033f + md5sums = 1d9b87cd833d24d0a5b415779288934b pkgname = vdr-externalplayer @@ -4,7 +4,7 @@ pkgname=vdr-externalplayer pkgver=0.3.2 _vdrapi=2.2.0 -pkgrel=16 +pkgrel=17 pkgdesc="use external players in VDR" url="http://www.uli-eckhardt.de/vdr/external.en.shtml" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') @@ -13,11 +13,18 @@ depends=('gcc-libs' "vdr-api=${_vdrapi}") backup=('var/lib/vdr/plugins/externalplayer.conf') _plugname=${pkgname//vdr-/} source=("http://www.uli-eckhardt.de/vdr/download/$pkgname-$pkgver.tgz" - "50-$_plugname.conf") + "50-$_plugname.conf" + 'externalplayer-fix-operator-mismatch.diff') backup=("etc/vdr/conf.avail/50-$_plugname.conf" "var/lib/vdr/plugins/$_plugname.conf") md5sums=('fe51ca255507db0ea4d4bc45ee43aee9' - '4e40f42e1d1f54ea98dc8004fe79033f') + '4e40f42e1d1f54ea98dc8004fe79033f' + '1d9b87cd833d24d0a5b415779288934b') + +prepare() { + cd "${srcdir}/${_plugname}-${pkgver}" + patch -i "$srcdir/externalplayer-fix-operator-mismatch.diff" +} build() { cd "${srcdir}/${_plugname}-${pkgver}" diff --git a/externalplayer-fix-operator-mismatch.diff b/externalplayer-fix-operator-mismatch.diff new file mode 100644 index 000000000000..196cac4ecc90 --- /dev/null +++ b/externalplayer-fix-operator-mismatch.diff @@ -0,0 +1,16 @@ +--- externalplayer-config.c.orig 2016-08-15 00:34:15.782468108 +0200 ++++ externalplayer-config.c 2016-08-15 00:35:02.141143092 +0200 +@@ -131,9 +131,10 @@ + + string cExternalplayerConfig::ReadConfigFile(const string &filename) { + ifstream playerConfigStream; +- playerConfigStream.open(filename.c_str(), ios::in); +- +- if (playerConfigStream == NULL) { ++ try { ++ playerConfigStream.open(filename.c_str(), ios::in); ++ } ++ catch (ifstream::failure e) { + throw FileNotFoundException(filename); + } + |