Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] mpc: update to 0.34.
@ 2022-02-09 21:05 tibequadorian
  2022-02-14  8:53 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 1 reply; 2+ messages in thread
From: tibequadorian @ 2022-02-09 21:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages mpc
https://github.com/void-linux/void-packages/pull/35496

mpc: update to 0.34.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35496.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mpc-35496.patch --]
[-- Type: text/x-diff, Size: 3565 bytes --]

From e9f87509a8c8a53e8239109d4119f157487750b3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Feb 2022 21:55:37 +0100
Subject: [PATCH] mpc: update to 0.34.

---
 ...-target-dependency-on-rsync-optional.patch | 61 +++++++++++++++++++
 srcpkgs/mpc/template                          |  4 +-
 2 files changed, 63 insertions(+), 2 deletions(-)
 create 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
new file mode 100644
index 000000000000..76ef70e479b1
--- /dev/null
+++ b/srcpkgs/mpc/patches/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
@@ -0,0 +1,61 @@
+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
+
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index 3fe612c0b44b..8d2e75832856 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -1,6 +1,6 @@
 # Template file for 'mpc'
 pkgname=mpc
-version=0.33
+version=0.34
 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=4f40ccbe18f5095437283cfc525a97815e983cbfd3a29e48ff610fa4f1bf1296
+checksum=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20
 
 post_install() {
 	vinstall contrib/mpc-completion.bash 644 usr/share/bash-completion/completions mpc

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-02-14  8:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-09 21:05 [PR PATCH] mpc: update to 0.34 tibequadorian
2022-02-14  8:53 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).