Date: Thursday, September 27, 2018 @ 17:38:25
Author: bisson
Revision: 335483
archrelease: copy trunk to extra-x86_64
Added:
ncmpc/repos/extra-x86_64/PKGBUILD
(from rev 335482, ncmpc/trunk/PKGBUILD)
Deleted:
ncmpc/repos/extra-x86_64/PKGBUILD
ncmpc/repos/extra-x86_64/progressbar.patch
-------------------+
PKGBUILD | 78 ++++++++++++++++++++++++----------------------------
progressbar.patch | 36 ------------------------
2 files changed, 37 insertions(+), 77 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-27 17:37:56 UTC (rev 335482)
+++ PKGBUILD 2018-09-27 17:38:25 UTC (rev 335483)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: damir <da...@archlinux.org>
-# Contributor: Daniel Bainton <dpb [at] backarrow.org>
-
-pkgname=ncmpc
-pkgver=0.30
-pkgrel=2
-pkgdesc='Fully featured MPD client using ncurses'
-url='https://www.musicpd.org/clients/ncmpc/'
-arch=('x86_64')
-license=('GPL')
-depends=('ncurses' 'glib2' 'libmpdclient')
-optdepends=('python2: to enable lyrics plugin'
- 'ruby: to enable lyrics plugin')
-makedepends=('meson' 'python-sphinx')
-validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
- 'progressbar.patch')
-sha256sums=('e3fe0cb58b8a77f63fb1645c2f974b334f1614efdc834ec698ee7d861f1b12a3'
- 'SKIP'
- '5ccc53da4f8e6a3fa2a2f7abad878bae846737a89cbde550170b25fa46d0292e')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed "s/curses == 'ncursesw'/false/g" -i meson.build
- patch -p1 -i ../progressbar.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- arch-meson . build -Dlyrics_screen=true
- ninja -C build
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- DESTDIR="${pkgdir}" ninja -C build install
-}
Copied: ncmpc/repos/extra-x86_64/PKGBUILD (from rev 335482,
ncmpc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-27 17:38:25 UTC (rev 335483)
@@ -0,0 +1,37 @@
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: damir <da...@archlinux.org>
+# Contributor: Daniel Bainton <dpb [at] backarrow.org>
+
+pkgname=ncmpc
+pkgver=0.31
+pkgrel=1
+pkgdesc='Fully featured MPD client using ncurses'
+url='https://www.musicpd.org/clients/ncmpc/'
+arch=('x86_64')
+license=('GPL')
+depends=('ncurses' 'glib2' 'libmpdclient')
+optdepends=('python2: to enable lyrics plugin'
+ 'ruby: to enable lyrics plugin')
+makedepends=('meson' 'python-sphinx')
+validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
+source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha256sums=('8d3416c5b99ec21527b506f75bd7e536ddff60e61695b05989e791a751611bcc'
+ '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
+ ninja -C build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ DESTDIR="${pkgdir}" ninja -C build install
+}
Deleted: progressbar.patch
===================================================================
--- progressbar.patch 2018-09-27 17:37:56 UTC (rev 335482)
+++ progressbar.patch 2018-09-27 17:38:25 UTC (rev 335483)
@@ -1,36 +0,0 @@
-From fa73e3faa29af8638d2557c6c808bda9dc67afc2 Mon Sep 17 00:00:00 2001
-From: Aleksi Blinnikka <aleksi.blinni...@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
