Re: [PR PATCH] [Updated] helvum: update to 0.4.1.

[0x5c <0x5c@users.noreply.github.com>]

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

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

https://github.com/0x5c/void-packages update/helvum
https://github.com/void-linux/void-packages/pull/46082

helvum: update to 0.4.1.
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46082.patch is attached

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

From 214d5be7113cd4f78a816436796695e1002fb699 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 16 Sep 2023 06:14:05 -0400
Subject: [PATCH] helvum: update to 0.4.1.

---
 srcpkgs/helvum/patches/32bit-c_long.patch | 23 +++++++++++++++++++++++
 srcpkgs/helvum/template                   | 19 ++++++++++++++++---
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/helvum/patches/32bit-c_long.patch

diff --git a/srcpkgs/helvum/patches/32bit-c_long.patch b/srcpkgs/helvum/patches/32bit-c_long.patch
new file mode 100644
index 0000000000000..0186f01d9565a
--- /dev/null
+++ b/srcpkgs/helvum/patches/32bit-c_long.patch
@@ -0,0 +1,23 @@
+--- a/libspa/src/pod/parser.rs
++++ b/libspa/src/pod/parser.rs
+@@ -5,7 +5,7 @@
+ // SPDX-License-Identifier: MIT
+ 
+ use std::{
+-    ffi::{c_char, c_double, c_float, c_int, c_long, c_void, CStr},
++    ffi::{c_char, c_double, c_float, c_int, c_void, CStr},
+     marker::PhantomData,
+     mem::MaybeUninit,
+ };
+@@ -174,9 +174,9 @@
+         }
+     }
+ 
+-    pub fn get_long(&mut self) -> Result<c_long, Errno> {
++    pub fn get_long(&mut self) -> Result<i64, Errno> {
+         unsafe {
+-            let mut long: MaybeUninit<c_long> = MaybeUninit::uninit();
++            let mut long: MaybeUninit<i64> = MaybeUninit::uninit();
+             let res = spa_sys::spa_pod_parser_get_long(self.as_raw_ptr(), long.as_mut_ptr());
+             if res >= 0 {
+                 Ok(long.assume_init())
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 1f3c89a66717c..88a51d9575933 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,7 +1,8 @@
 # Template file for 'helvum'
 pkgname=helvum
-version=0.4.0
+version=0.4.1
 revision=1
+_pwrs_version="0.7.2"
 build_style=cargo
 hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
@@ -10,8 +11,20 @@ short_desc="GTK patchbay for pipewire"
 maintainer="0x5c <dev@0x5c.io>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
-checksum=e93afa788d3e50bae489db888ecf0d79e5735b8f4f8b29fe4174540b0872b622
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pwrs_version}/pipewire-rs-v${_pwrs_version}.tar.gz"
+checksum="510fbe472c1d9de546f298b8fb954c493e2e3ad1df80e730558972bbee1d692c
+ fa1efaa854b84cdafe1526932f20be638ce28324acb0d62d9f6d1f73809f1548"
+build_wrksrc="helvum-${version}"
+patch_args="-Np1 -d pipewire-rs-v${_pwrs_version}"
+
+post_patch() {
+	cat <<-EOF >> "Cargo.toml"
+	[patch.crates-io]
+	pipewire = { path = "../pipewire-rs-v${_pwrs_version}/pipewire" }
+	EOF
+	cargo update --package pipewire@0.7.0 --precise 0.7.2
+}
 
 post_install() {
 	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually