[arch-commits] Commit in ncmpc/repos/extra-x86_64 (3 files)

[Gaëtan Bisson]

    Date: Wednesday, October 17, 2018 @ 17:22:22
  Author: bisson
Revision: 336806

archrelease: copy trunk to extra-x86_64

Added:
  ncmpc/repos/extra-x86_64/691116b22355bdaac211bd66e8c90fdecd9b2077.patch
    (from rev 336805, ncmpc/trunk/691116b22355bdaac211bd66e8c90fdecd9b2077.patch)
  ncmpc/repos/extra-x86_64/PKGBUILD
    (from rev 336805, ncmpc/trunk/PKGBUILD)
Deleted:
  ncmpc/repos/extra-x86_64/PKGBUILD

------------------------------------------------+
 691116b22355bdaac211bd66e8c90fdecd9b2077.patch |   24 +++++++
 PKGBUILD                                       |   77 +++++++++++------------
 2 files changed, 64 insertions(+), 37 deletions(-)

Copied: ncmpc/repos/extra-x86_64/691116b22355bdaac211bd66e8c90fdecd9b2077.patch (from rev 336805, ncmpc/trunk/691116b22355bdaac211bd66e8c90fdecd9b2077.patch)
===================================================================
--- 691116b22355bdaac211bd66e8c90fdecd9b2077.patch	                        (rev 0)
+++ 691116b22355bdaac211bd66e8c90fdecd9b2077.patch	2018-10-17 17:22:22 UTC (rev 336806)
@@ -0,0 +1,24 @@
+From 691116b22355bdaac211bd66e8c90fdecd9b2077 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max at 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);
+ }

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-17 17:21:44 UTC (rev 336805)
+++ PKGBUILD	2018-10-17 17:22:22 UTC (rev 336806)
@@ -1,37 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Daniel Bainton <dpb [at] backarrow.org>
-
-pkgname=ncmpc
-pkgver=0.32
-pkgrel=1
-pkgdesc='Fully featured MPD client using ncurses'
-url='https://www.musicpd.org/clients/ncmpc/'
-arch=('x86_64')
-license=('GPL')
-depends=('ncurses' 'libmpdclient' 'boost-libs')
-optdepends=('python2: to enable lyrics plugin'
-            '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})
-sha256sums=('085c85f4c68e4d4c643faa140bf3f118f191011ccc395a37f4be70c56ec001ac'
-            'SKIP')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed "s/curses == 'ncursesw'/false/g" -i meson.build
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	arch-meson . build -Dlyrics_screen=true --mandir /usr/share
-	ninja -C build
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	DESTDIR="${pkgdir}" ninja -C build install
-}

Copied: ncmpc/repos/extra-x86_64/PKGBUILD (from rev 336805, ncmpc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-17 17:22:22 UTC (rev 336806)
@@ -0,0 +1,40 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Daniel Bainton <dpb [at] backarrow.org>
+
+pkgname=ncmpc
+pkgver=0.32
+pkgrel=2
+pkgdesc='Fully featured MPD client using ncurses'
+url='https://www.musicpd.org/clients/ncmpc/'
+arch=('x86_64')
+license=('GPL')
+depends=('ncurses' 'libmpdclient' 'boost-libs')
+optdepends=('python2: to enable lyrics plugin'
+            '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}
+        '691116b22355bdaac211bd66e8c90fdecd9b2077.patch')
+sha256sums=('085c85f4c68e4d4c643faa140bf3f118f191011ccc395a37f4be70c56ec001ac'
+            'SKIP'
+            'ac4d8b66c240b42e2798e5b13e8b93c491e511a11c9aad43da76bfc971001492')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed "s/curses == 'ncursesw'/false/g" -i meson.build
+	patch -p1 -i ../691116b22355bdaac211bd66e8c90fdecd9b2077.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	arch-meson . build -Dlyrics_screen=true --mandir /usr/share
+	ninja -C build
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	DESTDIR="${pkgdir}" ninja -C build install
+}