mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
mpc: update to 0.35.
This commit is contained in:
parent
e73b2dd23d
commit
683cb1b4d5
2 changed files with 2 additions and 63 deletions
|
@ -1,61 +0,0 @@
|
||||||
From b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
|
|
||||||
Date: Tue, 30 Nov 2021 02:53:23 +0100
|
|
||||||
Subject: [PATCH] doc: make upload target dependency on rsync optional
|
|
||||||
|
|
||||||
Currently, rsync is an unconditional dependency and checked during
|
|
||||||
`meson configure`. As such, the build will fail if rsync is not
|
|
||||||
installed which is probably not what was intended here.
|
|
||||||
|
|
||||||
From the meson documentation:
|
|
||||||
|
|
||||||
Meson will automatically insert the appropriate dependencies on
|
|
||||||
targets and files listed in this keyword [the command] argument.
|
|
||||||
|
|
||||||
This commit fixes the unconditional dependency on rsync with an explicit
|
|
||||||
find_program invocation with `required: false`. Also wrap the
|
|
||||||
custom_target in an if statement since it is not allowed to use
|
|
||||||
non-found external programs in `command`.
|
|
||||||
---
|
|
||||||
doc/meson.build | 25 ++++++++++++++-----------
|
|
||||||
1 file changed, 14 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/doc/meson.build b/doc/meson.build
|
|
||||||
index f9475da..62529f8 100644
|
|
||||||
--- a/doc/meson.build
|
|
||||||
+++ b/doc/meson.build
|
|
||||||
@@ -8,17 +8,20 @@ sphinx_output = custom_target(
|
|
||||||
install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()),
|
|
||||||
)
|
|
||||||
|
|
||||||
-custom_target(
|
|
||||||
- 'upload',
|
|
||||||
- input: sphinx_output,
|
|
||||||
- output: 'upload',
|
|
||||||
- build_always_stale: true,
|
|
||||||
- command: [
|
|
||||||
- 'rsync', '-vpruz', '--delete', '@INPUT@',
|
|
||||||
- 'www.musicpd.org:/var/www/mpd/doc/mpc/',
|
|
||||||
- '--chmod=a+rX',
|
|
||||||
- ],
|
|
||||||
-)
|
|
||||||
+rsync = find_program('rsync', required: false)
|
|
||||||
+if rsync.found()
|
|
||||||
+ custom_target(
|
|
||||||
+ 'upload',
|
|
||||||
+ input: sphinx_output,
|
|
||||||
+ output: 'upload',
|
|
||||||
+ build_always_stale: true,
|
|
||||||
+ command: [
|
|
||||||
+ rsync, '-vpruz', '--delete', '@INPUT@',
|
|
||||||
+ 'www.musicpd.org:/var/www/mpd/doc/mpc/',
|
|
||||||
+ '--chmod=a+rX',
|
|
||||||
+ ],
|
|
||||||
+ )
|
|
||||||
+endif
|
|
||||||
|
|
||||||
custom_target(
|
|
||||||
'Manpage documentation',
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'mpc'
|
# Template file for 'mpc'
|
||||||
pkgname=mpc
|
pkgname=mpc
|
||||||
version=0.34
|
version=0.35
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
configure_args="-Dtest=true -Ddocumentation=enabled"
|
configure_args="-Dtest=true -Ddocumentation=enabled"
|
||||||
|
@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
|
||||||
homepage="https://www.musicpd.org/clients/mpc/"
|
homepage="https://www.musicpd.org/clients/mpc/"
|
||||||
#changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS"
|
#changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS"
|
||||||
distfiles="https://www.musicpd.org/download/mpc/${version%.*}/mpc-${version}.tar.xz"
|
distfiles="https://www.musicpd.org/download/mpc/${version%.*}/mpc-${version}.tar.xz"
|
||||||
checksum=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20
|
checksum=382959c3bfa2765b5346232438650491b822a16607ff5699178aa1386e3878d4
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vinstall contrib/mpc-completion.bash 644 usr/share/bash-completion/completions mpc
|
vinstall contrib/mpc-completion.bash 644 usr/share/bash-completion/completions mpc
|
||||||
|
|
Loading…
Add table
Reference in a new issue