From f0b1f41e2eca16800069701e216c5da7d6549d8c Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sat, 23 Sep 2017 11:06:37 -0400 Subject: [PATCH] ncmpc: update to 0.28 - Upstream switched to meson for build system - Include patch to fix auto-detecting of ncurses header Closes: #7790 [via git-merge-pr] --- srcpkgs/ncmpc/patches/ncurses.patch | 15 +++++++++++++++ srcpkgs/ncmpc/template | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ncmpc/patches/ncurses.patch diff --git a/srcpkgs/ncmpc/patches/ncurses.patch b/srcpkgs/ncmpc/patches/ncurses.patch new file mode 100644 index 0000000000..d0c7564bcc --- /dev/null +++ b/srcpkgs/ncmpc/patches/ncurses.patch @@ -0,0 +1,15 @@ +We don't include ncursesw.h header file, so use ncurses.h instead. + +--- ./meson.build 2017-09-23 10:57:09.288877085 -0400 ++++ ./meson.build 2017-09-23 10:58:40.263583716 -0400 +@@ -83,6 +83,10 @@ + conf.set('HAVE_NCURSESW_CURSES_H', true) + elif cc.has_header('ncursesw.h', dependencies: curses_dep) + conf.set('HAVE_NCURSESW_H', true) ++ elif cc.has_header('ncurses/curses.h', dependencies: curses_dep) ++ conf.set('HAVE_NCURSES_CURSES_H', true) ++ elif cc.has_header('ncurses.h', dependencies: curses_dep) ++ conf.set('HAVE_NCURSES_H', true) + else + error('No ncursesw header found') + endif diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template index 8bdd9dec08..ba14ed897d 100644 --- a/srcpkgs/ncmpc/template +++ b/srcpkgs/ncmpc/template @@ -1,8 +1,8 @@ # Template file for 'ncmpc' pkgname=ncmpc -version=0.27 +version=0.28 revision=1 -build_style=gnu-configure +build_style=meson hostmakedepends="pkg-config" makedepends="ncurses-devel glib-devel libmpdclient-devel" short_desc="Ncurses-based mpd client" @@ -10,7 +10,7 @@ maintainer="Getty Ritter " license="GPL-2" homepage="https://www.musicpd.org/clients/ncmpc/" distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz" -checksum=f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9 +checksum=f66e5b6fef83bdfda3b3efaf3fbad6a4d8c47bb1b3b6810bed44d3e35b007804 post_install() { vmkdir usr/share/examples/ncmpc