Re: [PR PATCH] [Updated] New package: shortwave-1.1.1

[oynqr <oynqr@users.noreply.github.com>]

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

There is an updated pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages shortwave
https://github.com/void-linux/void-packages/pull/29157

New package: shortwave-1.1.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

I did not find what causes the x86_64-musl builds to fail, any help with that would be appreciated.
Closes #28886

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29157.patch is attached

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

From 33cd4e43d8426dbffdccb4556b9faa838405954b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sun, 8 Aug 2021 14:23:57 +0200
Subject: [PATCH] New package: shortwave-2.0.1

---
 .../patches/fix-build-from-tar.patch          | 74 +++++++++++++++++++
 srcpkgs/shortwave/template                    | 22 ++++++
 2 files changed, 96 insertions(+)
 create mode 100644 srcpkgs/shortwave/patches/fix-build-from-tar.patch
 create mode 100644 srcpkgs/shortwave/template

diff --git a/srcpkgs/shortwave/patches/fix-build-from-tar.patch b/srcpkgs/shortwave/patches/fix-build-from-tar.patch
new file mode 100644
index 000000000000..9be21a51c4d1
--- /dev/null
+++ b/srcpkgs/shortwave/patches/fix-build-from-tar.patch
@@ -0,0 +1,74 @@
+--- a/build-aux/cargo.sh
++++ b/build-aux/cargo.sh
+@@ -5,9 +5,15 @@ export MESON_SOURCE_ROOT="$2"
+ export APP_OUTPUT="$3"
+ export APP_LOCALEDIR="$4"
+ export APP_PROFILE="$5"
++export XBPS_RUST_TARGET="$6"
+ 
+ export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target
+-export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
++
++export CARGO_OUTPUT_DIR="$CARGO_TARGET_DIR"
++if ! test -z "$XBPS_RUST_TARGET"
++then
++    export CARGO_OUTPUT_DIR="${CARGO_OUTPUT_DIR}/${XBPS_RUST_TARGET}"
++fi
+ 
+ echo "** RUST VERSION **"
+ rustc --version
+@@ -17,10 +23,10 @@ then
+     echo "** DEBUG MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml && \
+-        cp "$CARGO_TARGET_DIR"/debug/shortwave $APP_OUTPUT
++        cp "$CARGO_OUTPUT_DIR"/debug/shortwave $APP_OUTPUT
+ else
+     echo "** RELEASE MODE **"
+     cargo build --manifest-path \
+         "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+-        cp "$CARGO_TARGET_DIR"/release/shortwave $APP_OUTPUT
++        cp "$CARGO_OUTPUT_DIR"/release/shortwave $APP_OUTPUT
+ fi
+--- a/meson.build
++++ b/meson.build
+@@ -26,10 +26,11 @@ dependency('gstreamer-bad-audio-1.0', version: '>= 1.16')
+ name       = 'Shortwave'
+ app_id     = 'de.haeckerfelix.Shortwave'
+ profile    = get_option('profile')
+-vcs_tag    = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
++vcs_tag    = get_option('tag')
+ localedir  = join_paths(get_option('prefix'), get_option('localedir'))
+ datadir    = get_option('datadir')
+ pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
++xbps_rust_target = get_option('xbps_rust_target')
+ 
+ # Change app id for development builds
+ if profile == 'development'
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,3 +8,13 @@ option (
+   ],
+   value: 'default'
+ )
++option (
++  'tag',
++  type: 'string',
++  value: 'none'
++)
++option (
++  'xbps_rust_target',
++  type: 'string',
++  value: ''
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -110,6 +110,7 @@ cargo_release = custom_target(
+     meson.source_root(),
+     '@OUTPUT@',
+     localedir,
+-    profile
++    profile,
++    xbps_rust_target
+   ]
+ )
diff --git a/srcpkgs/shortwave/template b/srcpkgs/shortwave/template
new file mode 100644
index 000000000000..81e56101df00
--- /dev/null
+++ b/srcpkgs/shortwave/template
@@ -0,0 +1,22 @@
+# Template file for 'shortwave'
+pkgname=shortwave
+version=2.0.1
+revision=1
+_short_rev="9bfc5ee"
+build_style=meson
+build_helper=rust
+configure_args=" -Dtag=${_short_rev}"
+hostmakedepends="cargo gettext glib-devel pkg-config rust sqlite-devel"
+makedepends="gstreamer1-devel gst-plugins-bad1-devel gtk4-devel libadwaita-devel openssl-devel rust-std sqlite-devel"
+depends="gst-plugins-good1"
+checkdepends="desktop-file-utils"
+short_desc="GTK internet radio player, written in Rust"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/World/Shortwave"
+distfiles="https://gitlab.gnome.org/World/Shortwave/uploads/1c5adbe8c3181b2ba81d944a8f9a889d/${pkgname}-${version}.tar.xz"
+checksum=feefff2dc24ff8ef7fee5114a68e70cf7df56e4f643e29318e4d0092dcfd92ae
+
+if ! [ -z "$CROSS_BUILD" ]; then
+	configure_args+=" -Dxbps_rust_target=${XBPS_CROSS_RUST_TARGET}"
+fi