From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: Re: [PATCH] Update ncmpcpp to v0.6.2 Date: Fri, 27 Feb 2015 07:50:05 -0500 Message-ID: <87vbin8qo2.fsf@fsf.org> References: <87sidrll19.fsf@denknerd.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRKMq-00018z-FA for guix-devel@gnu.org; Fri, 27 Feb 2015 07:50:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRKMp-00068i-1i for guix-devel@gnu.org; Fri, 27 Feb 2015 07:50:08 -0500 Received: from mail.fsf.org ([208.118.235.13]:44712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRKMo-00068X-Vi for guix-devel@gnu.org; Fri, 27 Feb 2015 07:50:07 -0500 In-Reply-To: <87sidrll19.fsf@denknerd.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Paul van der Walt , Guix-devel Paul van der Walt writes: > A patch to update ncmpcpp, the mpd frontend. I hope my patch makes more > sense now -- the build system is a little finicky, so perhaps there's a > neater way to accomplish what i'm doing. Thanks for updating this! > From e1382a9df3e7df94e794df8aa247920b7e28c0c6 Mon Sep 17 00:00:00 2001 > From: Paul van der Walt > Date: Fri, 27 Feb 2015 10:54:07 +0100 > Subject: [PATCH] gnu: ncmpcpp: Update to 0.6.2. > > * gnu/packages/mpd.scm (ncmpcpp): Update to 0.6.2. Add readline, boost, > autotools. Patch build system to find boost correctly (without -mt suffix). > --- > gnu/packages/mpd.scm | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) Could you please add a copyright line for yourself at the top of this file? > > diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm > index a1b4272..1daf261 100644 > --- a/gnu/packages/mpd.scm > +++ b/gnu/packages/mpd.scm > @@ -27,6 +27,8 @@ > #:use-module (guix utils) > #:use-module (guix build-system gnu) > #:use-module (gnu packages avahi) > + #:use-module (gnu packages boost) > + #:use-module (gnu packages readline) > #:use-module (gnu packages compression) > #:use-module (gnu packages curl) > #:use-module (gnu packages doxygen) > @@ -35,6 +37,7 @@ > #:use-module (gnu packages mp3) > #:use-module (gnu packages ncurses) > #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages autotools) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages databases) > #:use-module (gnu packages video) > @@ -153,7 +156,7 @@ terminal using ncurses.") > (define ncmpcpp > (package > (name "ncmpcpp") > - (version "0.5.10") > + (version "0.6.2") > (source (origin > (method url-fetch) > (uri > @@ -161,11 +164,29 @@ terminal using ncurses.") > version ".tar.bz2")) > (sha256 > (base32 > - "1a54g6dary1rirrny9fd0hpxpyyffypni3mpbdpvmjnrl9v56vgz")))) > + "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck")))) > (build-system gnu-build-system) > (inputs `(("libmpdclient" ,libmpdclient) > ("ncurses" ,ncurses))) > - (native-inputs `(("pkg-config" ,pkg-config))) > + (native-inputs > + `(("pkg-config" ,pkg-config) > + ("readline" ,readline) > + ("automake" ,automake) > + ("autoconf" ,autoconf) > + ("libtool" ,libtool) > + ("boost" ,boost))) I doubt that readline and boost should be native inputs. Please add them as regular inputs. > + (arguments > + '(#:configure-flags > + '("BOOST_LIB_SUFFIX=") > + #:phases > + (alist-cons-after > + 'unpack 'autogen > + (lambda _ > + (substitute* "autogen.sh" > + (("/bin/sh") (which "bash"))) Is "autogen.sh" not executable? If it starts with a shebang, Guix should patch the file appropriately. Does the build fail with this removed? > + (setenv "NOCONFIGURE" "true") > + (zero? (system* "bash" "autogen.sh"))) If its executable, you can say: (zero? (system* "./autogen.sh")) It's strange that the project used to ship a pre-built Makefile but now requires users to do the autotools bootstrapping. Oh well. > + %standard-phases))) > (synopsis "Featureful ncurses based MPD client inspired by ncmpc") > (description "Ncmpcpp is an mpd client with a UI very similar to ncmpc, > but it provides new useful features such as support for regular expressions > -- > 2.3.1 > Could you send an updated patch? Thanks! -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate