Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
ce88548e
Commit
ce88548e
authored
1 year ago
by
Sören Tempel
Committed by
Sören Tempel
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
community/mpc: upgrade to 0.35
parent
97fcafe9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!57835
community/mpc: upgrade to 0.35
Pipeline
#203248
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
+0
-58
0 additions, 58 deletions
...doc-make-upload-target-dependency-on-rsync-optional.patch
community/mpc/APKBUILD
+3
-5
3 additions, 5 deletions
community/mpc/APKBUILD
with
3 additions
and
63 deletions
community/mpc/0001-doc-make-upload-target-dependency-on-rsync-optional.patch
deleted
100644 → 0
+
0
−
58
View file @
97fcafe9
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',
This diff is collapsed.
Click to expand it.
community/mpc/APKBUILD
+
3
−
5
View file @
ce88548e
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
mpc
pkgname
=
mpc
pkgver
=
0.3
4
pkgver
=
0.3
5
pkgrel
=
0
pkgrel
=
0
pkgdesc
=
"Minimalist command line interface to MPD"
pkgdesc
=
"Minimalist command line interface to MPD"
url
=
"https://www.musicpd.org/clients/mpc/"
url
=
"https://www.musicpd.org/clients/mpc/"
...
@@ -9,8 +9,7 @@ arch="all"
...
@@ -9,8 +9,7 @@ arch="all"
license
=
"GPL-2.0-or-later"
license
=
"GPL-2.0-or-later"
makedepends
=
"libmpdclient-dev py3-sphinx meson check-dev"
makedepends
=
"libmpdclient-dev py3-sphinx meson check-dev"
subpackages
=
"
$pkgname
-bash-completion:bashcomp:noarch
$pkgname
-doc"
subpackages
=
"
$pkgname
-bash-completion:bashcomp:noarch
$pkgname
-doc"
source
=
"https://www.musicpd.org/download/
$pkgname
/
${
pkgver
%.*
}
/
$pkgname
-
$pkgver
.tar.xz
source
=
"https://www.musicpd.org/download/
$pkgname
/
${
pkgver
%.*
}
/
$pkgname
-
$pkgver
.tar.xz"
0001-doc-make-upload-target-dependency-on-rsync-optional.patch"
build
()
{
build
()
{
abuild-meson
\
abuild-meson
\
...
@@ -38,6 +37,5 @@ bashcomp() {
...
@@ -38,6 +37,5 @@ bashcomp() {
}
}
sha512sums
=
"
sha512sums
=
"
d43d5547134ffb24f2a2972882f6e264c1011a94d1033369d329487f59414d32d9842835afdd05da96fd8ed28f823d2ae2f46d8d8d24b68f3695badca2a9bbb2 mpc-0.34.tar.xz
be7ec268432eb8e34092d025e6a40379e83d54e5f87943beeb87ed8fe9db4c5c8261b09cc3230ada28300151382f97b1c2da45f54e8aad68af9946f484d0b28b mpc-0.35.tar.xz
60c00c5ab212d453f879ac391d58be4d0fb7ea97dd974ac2369463bebc2e3a05f7176f3c89328b432d84382ecee9c8e9d67e16a0eb50219aeca53675d6a5988f 0001-doc-make-upload-target-dependency-on-rsync-optional.patch
"
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment