From 8b04d0fcdfc120b8aa93656559f115ad83c760e7 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 28 Sep 2023 20:13:05 -0400
Subject: [PATCH] helvum: update to 0.5.1.

---
 srcpkgs/helvum/patches/32bit-c_long.patch | 23 -----------------------
 srcpkgs/helvum/template                   | 18 +++++++-----------
 2 files changed, 7 insertions(+), 34 deletions(-)
 delete 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
deleted file mode 100644
index 0186f01d9565a..0000000000000
--- a/srcpkgs/helvum/patches/32bit-c_long.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 88a51d9575933..f678398e3be58 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,29 +1,25 @@
 # Template file for 'helvum'
 pkgname=helvum
-version=0.4.1
+version=0.5.1
 revision=1
-_pwrs_version="0.7.2"
 build_style=cargo
 hostmakedepends="pkg-config clang libclang"
-makedepends="gtk4-devel pipewire-devel glib-devel"
+makedepends="gtk4-devel pipewire-devel glib-devel libadwaita-devel"
 depends="pipewire"
 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
- 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}"
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
+checksum=e7a179a35518d7add92affbe5cdaa90c4a4e20c25ae0c86c2aea470de7dcd7ed
 
 post_patch() {
 	cat <<-EOF >> "Cargo.toml"
 	[patch.crates-io]
-	pipewire = { path = "../pipewire-rs-v${_pwrs_version}/pipewire" }
+	pipewire = {git="https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", rev="ff923ee9dfe05ac50a137252ca45ac4361016360"}
 	EOF
-	cargo update --package pipewire@0.7.0 --precise 0.7.2
+	# Needed to get the above to register
+	cargo update --package pipewire@0.7.2 --precise 0.7.2
 }
 
 post_install() {