From ce88548e63f26cb42ee4a923ae27522c7b3f13a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sat, 23 Dec 2023 07:36:54 +0100
Subject: [PATCH] community/mpc: upgrade to 0.35
---
...-target-dependency-on-rsync-optional.patch | 58 -------------------
community/mpc/APKBUILD | 8 +--
2 files changed, 3 insertions(+), 63 deletions(-)
delete mode 100644 community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
diff --git a/community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch b/community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
deleted file mode 100644
index a3b05e1a17e0..000000000000
--- a/community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
+++ /dev/null
@@ -1,58 +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',
diff --git a/community/mpc/APKBUILD b/community/mpc/APKBUILD
index a0bb78c83a33..cf46dac52ac9 100644
--- a/community/mpc/APKBUILD
+++ b/community/mpc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mpc
-pkgver=0.34
+pkgver=0.35
pkgrel=0
pkgdesc="Minimalist command line interface to MPD"
url="https://www.musicpd.org/clients/mpc/"
@@ -9,8 +9,7 @@ arch="all"
license="GPL-2.0-or-later"
makedepends="libmpdclient-dev py3-sphinx meson check-dev"
subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc"
-source="https://www.musicpd.org/download/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- 0001-doc-make-upload-target-dependency-on-rsync-optional.patch"
+source="https://www.musicpd.org/download/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
build() {
abuild-meson \
@@ -38,6 +37,5 @@ bashcomp() {
}
sha512sums="
-d43d5547134ffb24f2a2972882f6e264c1011a94d1033369d329487f59414d32d9842835afdd05da96fd8ed28f823d2ae2f46d8d8d24b68f3695badca2a9bbb2 mpc-0.34.tar.xz
-60c00c5ab212d453f879ac391d58be4d0fb7ea97dd974ac2369463bebc2e3a05f7176f3c89328b432d84382ecee9c8e9d67e16a0eb50219aeca53675d6a5988f 0001-doc-make-upload-target-dependency-on-rsync-optional.patch
+be7ec268432eb8e34092d025e6a40379e83d54e5f87943beeb87ed8fe9db4c5c8261b09cc3230ada28300151382f97b1c2da45f54e8aad68af9946f484d0b28b mpc-0.35.tar.xz
"
--
GitLab