From 683cb1b4d59a34631534bfdd468b6c5f8254d398 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 24 Feb 2024 13:10:11 -0500 Subject: [PATCH] mpc: update to 0.35. --- ...-target-dependency-on-rsync-optional.patch | 61 ------------------- srcpkgs/mpc/template | 4 +- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/mpc/patches/0001-doc-make-upload-target-dependency-on-rsync-optional.patch diff --git a/srcpkgs/mpc/patches/0001-doc-make-upload-target-dependency-on-rsync-optional.patch b/srcpkgs/mpc/patches/0001-doc-make-upload-target-dependency-on-rsync-optional.patch deleted file mode 100644 index 76ef70e479b..00000000000 --- a/srcpkgs/mpc/patches/0001-doc-make-upload-target-dependency-on-rsync-optional.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b656ca4b6c2a0d5b6cebd7f7daa679352f664e0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -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 - diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template index 8d2e7583285..8bb6fbf35dd 100644 --- a/srcpkgs/mpc/template +++ b/srcpkgs/mpc/template @@ -1,6 +1,6 @@ # Template file for 'mpc' pkgname=mpc -version=0.34 +version=0.35 revision=1 build_style=meson configure_args="-Dtest=true -Ddocumentation=enabled" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://www.musicpd.org/clients/mpc/" #changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/master/NEWS" distfiles="https://www.musicpd.org/download/mpc/${version%.*}/mpc-${version}.tar.xz" -checksum=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20 +checksum=382959c3bfa2765b5346232438650491b822a16607ff5699178aa1386e3878d4 post_install() { vinstall contrib/mpc-completion.bash 644 usr/share/bash-completion/completions mpc