Date: Wednesday, February 14, 2018 @ 20:27:31
Author: bisson
Revision: 317036
archrelease: copy trunk to extra-x86_64
Added:
mpc/repos/extra-x86_64/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
(from rev 317035, mpc/trunk/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch)
mpc/repos/extra-x86_64/PKGBUILD
(from rev 317035, mpc/trunk/PKGBUILD)
Deleted:
mpc/repos/extra-x86_64/PKGBUILD
------------------------------------------------+
2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch | 26 +++++++
PKGBUILD | 75 ++++++++++++-----------
2 files changed, 67 insertions(+), 34 deletions(-)
Copied: mpc/repos/extra-x86_64/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
(from rev 317035, mpc/trunk/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch)
===================================================================
--- 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
(rev 0)
+++ 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch 2018-02-14 20:27:31 UTC
(rev 317036)
@@ -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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-14 20:26:38 UTC (rev 317035)
+++ PKGBUILD 2018-02-14 20:27:31 UTC (rev 317036)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Angel Velasquez <an...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Link Dupont <l...@subpop.net>
-
-pkgname=mpc
-pkgver=0.29
-pkgrel=1
-pkgdesc='Minimalist command line interface to MPD'
-url='https://www.musicpd.org/clients/mpc/'
-license=('GPL2')
-arch=('x86_64')
-makedepends=('meson')
-depends=('libmpdclient')
-validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-sha256sums=('02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3'
- 'SKIP')
-
-options=('!emptydirs')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- arch-meson . build
- ninja -C build
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- DESTDIR="${pkgdir}" ninja -C build install
- install -Dm644 contrib/mpc-completion.bash
"${pkgdir}/usr/share/bash-completion/completions/mpc"
-}
Copied: mpc/repos/extra-x86_64/PKGBUILD (from rev 317035, mpc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-14 20:27:31 UTC (rev 317036)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Link Dupont <l...@subpop.net>
+
+pkgname=mpc
+pkgver=0.29
+pkgrel=2
+pkgdesc='Minimalist command line interface to MPD'
+url='https://www.musicpd.org/clients/mpc/'
+license=('GPL2')
+arch=('x86_64')
+makedepends=('meson' 'python-sphinx')
+depends=('libmpdclient')
+validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
+source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+ '2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch')
+sha256sums=('02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3'
+ 'SKIP'
+ '2f5c84c3869c8f36924f2707c1e956b49a397d6d93ad20c002a82eaae9ecc6ac')
+
+options=('!emptydirs')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ arch-meson . build
+ ninja -C build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ DESTDIR="${pkgdir}" ninja -C build install
+ install -Dm644 contrib/mpc-completion.bash
"${pkgdir}/usr/share/bash-completion/completions/mpc"
+}
