[arch-commits] Commit in ncmpc/trunk (PKGBUILD progressbar.patch)

[Gaëtan Bisson]

    Date: Monday, June 18, 2018 @ 20:46:39
  Author: bisson
Revision: 327168

fix FS#58977

Added:
  ncmpc/trunk/progressbar.patch
Modified:
  ncmpc/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 progressbar.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-18 19:48:11 UTC (rev 327167)
+++ PKGBUILD	2018-06-18 20:46:39 UTC (rev 327168)
@@ -7,7 +7,7 @@
 
 pkgname=ncmpc
 pkgver=0.30
-pkgrel=1
+pkgrel=2
 pkgdesc='Fully featured MPD client using ncurses'
 url='https://www.musicpd.org/clients/ncmpc/'
 arch=('x86_64')
@@ -17,13 +17,16 @@
             'ruby: to enable lyrics plugin')
 makedepends=('meson' 'python-sphinx')
 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}
+        'progressbar.patch')
 sha256sums=('e3fe0cb58b8a77f63fb1645c2f974b334f1614efdc834ec698ee7d861f1b12a3'
-            'SKIP')
+            'SKIP'
+            '5ccc53da4f8e6a3fa2a2f7abad878bae846737a89cbde550170b25fa46d0292e')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed "s/curses == 'ncursesw'/false/g" -i meson.build
+	patch -p1 -i ../progressbar.patch
 }
 
 build() {

Added: progressbar.patch
===================================================================
--- progressbar.patch	                        (rev 0)
+++ progressbar.patch	2018-06-18 20:46:39 UTC (rev 327168)
@@ -0,0 +1,36 @@
+From fa73e3faa29af8638d2557c6c808bda9dc67afc2 Mon Sep 17 00:00:00 2001
+From: Aleksi Blinnikka <aleksi.blinnikka at gmail.com>
+Date: Tue, 10 Apr 2018 02:33:30 +0300
+Subject: [PATCH] Fix blank progressbar when colors are not in use
+
+When moving wbkgd() call in 9c22a95 it was not conditional like it was
+for others (commits 7946611 and 6b337bc), which caused progress bar to
+not show.
+---
+ src/ProgressBar.cxx | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/ProgressBar.cxx b/src/ProgressBar.cxx
+index 7ddc72f..02782db 100644
+--- a/src/ProgressBar.cxx
++++ b/src/ProgressBar.cxx
+@@ -19,6 +19,7 @@
+ 
+ #include "ProgressBar.hxx"
+ #include "colors.hxx"
++#include "options.hxx"
+ 
+ #include <assert.h>
+ 
+@@ -26,7 +27,10 @@ ProgressBar::ProgressBar(Point p, unsigned _width)
+ 	:window(p, {_width, 1u})
+ {
+ 	leaveok(window.w, true);
+-	wbkgd(window.w, COLOR_PAIR(COLOR_PROGRESSBAR));
++#ifdef ENABLE_COLORS
++	if (options.enable_colors)
++		wbkgd(window.w, COLOR_PAIR(COLOR_PROGRESSBAR));
++#endif
+ }
+ 
+ void