Date: Wednesday, February 14, 2018 @ 20:26:38 Author: bisson Revision: 317035
implement FS#57504 Added: mpc/trunk/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch Modified: mpc/trunk/PKGBUILD ------------------------------------------------+ 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch | 26 +++++++++++++++++++++++ PKGBUILD | 15 +++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) Added: 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch =================================================================== --- 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch (rev 0) +++ 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch 2018-02-14 20:26:38 UTC (rev 317035) @@ -0,0 +1,26 @@ +From 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0 Mon Sep 17 00:00:00 2001 +From: Max Kellermann <m...@musicpd.org> +Date: Mon, 12 Feb 2018 21:50:44 +0100 +Subject: [PATCH] doc/meson.build: drop bogus "man" from manpage install path + +Closes #12 +--- + doc/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index fd7e3d6..7793627 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -15,9 +15,9 @@ if sphinx.found() + 'Manpage documentation', + output: 'man', + input: ['index.rst', 'conf.py'], +- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'], ++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'], + build_by_default: true, + install: true, +- install_dir: join_paths(get_option('datadir'), 'man', 'man1'), ++ install_dir: get_option('datadir'), + ) + endif Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-14 19:28:12 UTC (rev 317034) +++ PKGBUILD 2018-02-14 20:26:38 UTC (rev 317035) @@ -7,20 +7,27 @@ pkgname=mpc pkgver=0.29 -pkgrel=1 +pkgrel=2 pkgdesc='Minimalist command line interface to MPD' url='https://www.musicpd.org/clients/mpc/' license=('GPL2') arch=('x86_64') -makedepends=('meson') +makedepends=('meson' 'python-sphinx') depends=('libmpdclient') 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} + '2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch') sha256sums=('02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3' - 'SKIP') + 'SKIP' + '2f5c84c3869c8f36924f2707c1e956b49a397d6d93ad20c002a82eaae9ecc6ac') options=('!emptydirs') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" arch-meson . build