Date: Wednesday, October 17, 2018 @ 17:21:44 Author: bisson Revision: 336805
fix FS#60343 Added: ncmpc/trunk/691116b22355bdaac211bd66e8c90fdecd9b2077.patch Modified: ncmpc/trunk/PKGBUILD ------------------------------------------------+ 691116b22355bdaac211bd66e8c90fdecd9b2077.patch | 24 +++++++++++++++++++++++ PKGBUILD | 9 +++++--- 2 files changed, 30 insertions(+), 3 deletions(-) Added: 691116b22355bdaac211bd66e8c90fdecd9b2077.patch =================================================================== --- 691116b22355bdaac211bd66e8c90fdecd9b2077.patch (rev 0) +++ 691116b22355bdaac211bd66e8c90fdecd9b2077.patch 2018-10-17 17:21:44 UTC (rev 336805) @@ -0,0 +1,24 @@ +From 691116b22355bdaac211bd66e8c90fdecd9b2077 Mon Sep 17 00:00:00 2001 +From: Max Kellermann <m...@musicpd.org> +Date: Wed, 10 Oct 2018 15:47:45 +0200 +Subject: [PATCH] conf: remove trailing whitespace from option names + +Closes #39 +--- + NEWS | 1 + + src/conf.cxx | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/conf.cxx b/src/conf.cxx +index d4c94a7..da8c163 100644 +--- a/src/conf.cxx ++++ b/src/conf.cxx +@@ -236,7 +236,7 @@ separate_value(char *p) + return nullptr; + } + +- *value++ = 0; ++ *StripRight(p, value++) = '\0'; + + return Strip(value); + } Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-17 17:21:05 UTC (rev 336804) +++ PKGBUILD 2018-10-17 17:21:44 UTC (rev 336805) @@ -6,7 +6,7 @@ pkgname=ncmpc pkgver=0.32 -pkgrel=1 +pkgrel=2 pkgdesc='Fully featured MPD client using ncurses' url='https://www.musicpd.org/clients/ncmpc/' arch=('x86_64') @@ -16,13 +16,16 @@ 'ruby: to enable lyrics plugin') makedepends=('meson' 'python-sphinx' 'boost') validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') -source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} + '691116b22355bdaac211bd66e8c90fdecd9b2077.patch') sha256sums=('085c85f4c68e4d4c643faa140bf3f118f191011ccc395a37f4be70c56ec001ac' - 'SKIP') + 'SKIP' + 'ac4d8b66c240b42e2798e5b13e8b93c491e511a11c9aad43da76bfc971001492') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed "s/curses == 'ncursesw'/false/g" -i meson.build + patch -p1 -i ../691116b22355bdaac211bd66e8c90fdecd9b2077.patch } build() {
