* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
@ 2022-02-13 19:11 ` classabbyamp
2022-02-13 20:06 ` classabbyamp
` (33 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-13 19:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 1109 bytes --]
From afb9a4139dcdf52729522576836b0b6959ac5d1a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..286d42bdb12a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,16 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config"
+makedepends="clang gtk4-devel pipewire-devel desktop-file-utils glib-devel
+ appstream-glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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=e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
2022-02-13 19:11 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-13 20:06 ` classabbyamp
2022-02-13 20:19 ` classabbyamp
` (32 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-13 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 1118 bytes --]
From be1b1d7b96e41cff9e73120543223489713b5495 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..d8dacb3f07ef
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,16 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config"
+makedepends="clang rust-std gtk4-devel pipewire-devel desktop-file-utils
+ glib-devel appstream-glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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=e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
2022-02-13 19:11 ` [PR PATCH] [Updated] " classabbyamp
2022-02-13 20:06 ` classabbyamp
@ 2022-02-13 20:19 ` classabbyamp
2022-02-13 20:35 ` dkwo
` (31 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-13 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 1140 bytes --]
From 63de31b685f3e8c960f7246379a86c09dea9baf7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..6b02b0202b03
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,16 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config"
+makedepends="clang rust-std gtk4-devel pipewire-devel desktop-file-utils
+ glib-devel appstream-glib-devel gtk-update-icon-cache"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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=e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (2 preceding siblings ...)
2022-02-13 20:19 ` classabbyamp
@ 2022-02-13 20:35 ` dkwo
2022-02-13 20:38 ` dkwo
` (30 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: dkwo @ 2022-02-13 20:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1038410849
Comment:
Does `gtk4-update-icon-cache` help?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (3 preceding siblings ...)
2022-02-13 20:35 ` dkwo
@ 2022-02-13 20:38 ` dkwo
2022-02-13 21:15 ` [PR PATCH] [Updated] " classabbyamp
` (29 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: dkwo @ 2022-02-13 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1038412791
Comment:
Or maybe these two need to go to `host`: appstream-glib-devel gtk-update-icon-cache?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (4 preceding siblings ...)
2022-02-13 20:38 ` dkwo
@ 2022-02-13 21:15 ` classabbyamp
2022-02-13 21:18 ` classabbyamp
` (28 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-13 21:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 1147 bytes --]
From eb041a0e6f5203dab787203c1f7877ac5805b4a7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..ed0a6f39e4be
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,15 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config gtk4-update-icon-cache desktop-file-utils clang libclang"
+makedepends="rust-std gtk4-devel pipewire-devel glib-devel appstream-glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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=e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (5 preceding siblings ...)
2022-02-13 21:15 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-13 21:18 ` classabbyamp
2022-02-14 0:31 ` [PR PATCH] [Updated] " classabbyamp
` (27 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-13 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1038436154
Comment:
still some issues on cross, but need to work on other things for now
i686 just needs [this patch](https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/merge_requests/108) for the pipewire crate
fwiw [alpine just gave up](https://git.alpinelinux.org/aports/tree/testing/helvum/APKBUILD#n10) on i686 and aarch32
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (6 preceding siblings ...)
2022-02-13 21:18 ` classabbyamp
@ 2022-02-14 0:31 ` classabbyamp
2022-02-14 3:17 ` classabbyamp
` (26 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-14 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 3207 bytes --]
From 6d17b01673676d8f269a77a01f9c995d88c062fe Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++++++
srcpkgs/helvum/template | 35 ++++++++++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..28218d5efbc3
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,35 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config gtk4-update-icon-cache desktop-file-utils clang libclang"
+makedepends="rust-std gtk4-devel pipewire-devel glib-devel appstream-glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ mv ../pipewire-rs-v0.4.1/pipewire pipewire
+ mv ../pipewire-rs-v0.4.1/pipewire-sys pipewire-sys
+ mv ../pipewire-rs-v0.4.1/libspa libspa
+ mv ../pipewire-rs-v0.4.1/libspa-sys libspa-sys
+ echo "[patch.crates-io]" >> Cargo.toml
+ echo "pipewire = { path = './pipewire' }" >> Cargo.toml
+ echo "pipewire-sys = { path = './pipewire-sys' }" >> Cargo.toml
+ echo "libspa = { path = './libspa' }" >> Cargo.toml
+ echo "libspa-sys = { path = './libspa-sys' }" >> Cargo.toml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (7 preceding siblings ...)
2022-02-14 0:31 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-14 3:17 ` classabbyamp
2022-02-14 3:18 ` classabbyamp
` (25 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-14 3:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 3084 bytes --]
From 32818023534a29e0f57b66622a37c20f9cc291b4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 ++++++++++++++
srcpkgs/helvum/template | 37 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..c5d0354dbc0f
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,37 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=meson
+build_helper=rust
+hostmakedepends="cargo pkg-config gtk4-update-icon-cache desktop-file-utils clang libclang"
+makedepends="rust-std gtk4-devel pipewire-devel glib-devel appstream-glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-v0.4.1/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i build/build.ninja -e "s|src/release|src/${CARGO_BUILD_TARGET}/release|"
+ fi
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (8 preceding siblings ...)
2022-02-14 3:17 ` classabbyamp
@ 2022-02-14 3:18 ` classabbyamp
2022-02-14 9:41 ` dkwo
` (24 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-14 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1038436154
Comment:
still some issues on cross, but need to work on other things for now
~~i686 just needs [this patch](https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/merge_requests/108) for the pipewire crate~~
fwiw [alpine just gave up](https://git.alpinelinux.org/aports/tree/testing/helvum/APKBUILD#n10) on i686 and aarch32
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (9 preceding siblings ...)
2022-02-14 3:18 ` classabbyamp
@ 2022-02-14 9:41 ` dkwo
2022-02-14 16:05 ` classabbyamp
` (23 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: dkwo @ 2022-02-14 9:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1038867386
Comment:
Does it make any difference if you add pipewire-devel to host as well?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (10 preceding siblings ...)
2022-02-14 9:41 ` dkwo
@ 2022-02-14 16:05 ` classabbyamp
2022-02-15 12:25 ` dkwo
` (22 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-14 16:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1039264433
Comment:
no, and I don't think that would make sense as a solution
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (11 preceding siblings ...)
2022-02-14 16:05 ` classabbyamp
@ 2022-02-15 12:25 ` dkwo
2022-02-19 22:24 ` 0x5c
` (21 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: dkwo @ 2022-02-15 12:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1040211915
Comment:
Just for future record: they both fail with
```
error: failed to run custom build command for `libspa-sys v0.4.1 (/builddir/helvum-0.3.4/libspa-sys)`
Caused by:
process didn't exit successfully: `/builddir/helvum-0.3.4/build/src/release/build/libspa-sys-8591670d6ba9e6b2/build-script-build` (exit status: 101)
--- stderr
/usr/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-32.h' file not found
/usr/include/gnu/stubs.h:7:11: fatal error: 'gnu/stubs-32.h' file not found, err: true
thread 'main' panicked at 'Unable to generate bindings: ()', libspa-sys/build.rs:37:39
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
warning: build failed, waiting for other jobs to finish...
```
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (12 preceding siblings ...)
2022-02-15 12:25 ` dkwo
@ 2022-02-19 22:24 ` 0x5c
2022-02-19 22:31 ` classabbyamp
` (20 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: 0x5c @ 2022-02-19 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046115610
Comment:
I did some research, and it seems that libspa-sys is inherently nocross, for now.
I uses bindgen to generate the bindings, but does no effort whatsoever to have bindgen use the target toolchain, resulting in the bindings being generated for the host.
This seems to work fine for musl, but glibc is a fragile thing that needs special handling. In this case stubs.h contains this
```h
/* This file is automatically generated.
This file selects the right generated file of `__stub_FUNCTION' macros
based on the architecture being compiled for. */
#if !defined __x86_64__
# include <gnu/stubs-32.h>
#endif
#if defined __x86_64__ && defined __LP64__
# include <gnu/stubs-64.h>
#endif
#if defined __x86_64__ && defined __ILP32__
# include <gnu/stubs-x32.h>
#endif
```
... which assumes 32bit when 64bit isn't defined
It seems that the musl bindings on cross might be broken too, just not in ways that prevents compilation. I would say it's nocross everywhere unless someone can test that musl cross produces working binaries.
Outside of that, meson is only being used a a very very very thin wrapper around cargo, and to update gtk's icon cache.
The first does no useful work, and the second should be done when installing the package. Switching the build style to cargo seems to work fine (apart from the existing cross issue), and removes the need for meson and the icon stuff in hostmakedeps.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (13 preceding siblings ...)
2022-02-19 22:24 ` 0x5c
@ 2022-02-19 22:31 ` classabbyamp
2022-02-20 0:27 ` 0x5c
` (19 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-19 22:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046116517
Comment:
If that's the case, I'd support nocross for now, and I think nixing meson will work, but may require future care in the case of added dependencies on updates
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (14 preceding siblings ...)
2022-02-19 22:31 ` classabbyamp
@ 2022-02-20 0:27 ` 0x5c
2022-02-20 1:15 ` [PR PATCH] [Updated] " classabbyamp
` (18 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: 0x5c @ 2022-02-20 0:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046115610
Comment:
I did some research, and it seems that libspa-sys is inherently nocross, for now.
It uses bindgen to generate the bindings, but does no effort whatsoever to have bindgen use the target toolchain, resulting in the bindings being generated for the host.
This seems to work fine for musl, but glibc is a fragile thing that needs special handling. In this case stubs.h contains this
```h
/* This file is automatically generated.
This file selects the right generated file of `__stub_FUNCTION' macros
based on the architecture being compiled for. */
#if !defined __x86_64__
# include <gnu/stubs-32.h>
#endif
#if defined __x86_64__ && defined __LP64__
# include <gnu/stubs-64.h>
#endif
#if defined __x86_64__ && defined __ILP32__
# include <gnu/stubs-x32.h>
#endif
```
... which assumes 32bit when 64bit isn't defined
It seems that the musl bindings on cross might be broken too, just not in ways that prevents compilation. I would say it's nocross everywhere unless someone can test that musl cross produces working binaries.
Outside of that, meson is only being used a a very very very thin wrapper around cargo, and to update gtk's icon cache.
The first does no useful work, and the second should be done when installing the package. Switching the build style to cargo seems to work fine (apart from the existing cross issue), and removes the need for meson and the icon stuff in hostmakedeps.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (15 preceding siblings ...)
2022-02-20 0:27 ` 0x5c
@ 2022-02-20 1:15 ` classabbyamp
2022-02-20 2:00 ` classabbyamp
` (17 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-20 1:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 3504 bytes --]
From 42986ea2e49972a71cd22aa28076b46250ad69ab Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 ++++++++++++
srcpkgs/helvum/template | 45 ++++++++++++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..3f50bb9d8519
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,45 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+# prevented by libspa-sys (https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046115610)
+nocross=yes
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-v0.4.1/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (16 preceding siblings ...)
2022-02-20 1:15 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-20 2:00 ` classabbyamp
2022-02-20 8:04 ` 0x5c
` (16 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-20 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 3495 bytes --]
From 2778e4c65fbffb16455817b639a622f2411a2240 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Feb 2022 13:43:49 -0500
Subject: [PATCH] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 ++++++++++++
srcpkgs/helvum/template | 45 ++++++++++++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..cbd0220fcf37
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,45 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config"
+makedepends="gtk4-devel pipewire-devel glib-devel clang"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+# prevented by libspa-sys (https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046115610)
+nocross=yes
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-v0.4.1/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (17 preceding siblings ...)
2022-02-20 2:00 ` classabbyamp
@ 2022-02-20 8:04 ` 0x5c
2022-02-20 21:32 ` classabbyamp
` (15 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: 0x5c @ 2022-02-20 8:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046184277
Comment:
Reported the crossbuild issue to upstream https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/40
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (18 preceding siblings ...)
2022-02-20 8:04 ` 0x5c
@ 2022-02-20 21:32 ` classabbyamp
2022-02-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
` (14 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-20 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1046325169
Comment:
@paper42, this should be ready for review
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (19 preceding siblings ...)
2022-02-20 21:32 ` classabbyamp
@ 2022-02-24 5:07 ` classabbyamp
2022-02-24 5:47 ` classabbyamp
` (13 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-24 5:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4919 bytes --]
From 98dc7f6fb73eeb08d541895c0050e5fa29073642 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From 6fda35d31b31813f195cccfadf8b6bb971cf5b2a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 46 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..06864a89c94d
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-v0.4.1/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (20 preceding siblings ...)
2022-02-24 5:07 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-24 5:47 ` classabbyamp
2022-02-24 20:30 ` classabbyamp
` (12 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-24 5:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4919 bytes --]
From 192ac5f3900410aef7778b17b1357a426727cf7f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From cefe6dd8c91135e48ba1d5f2a23ccb7138f96651 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 46 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..06864a89c94d
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="gtk4 pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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/v0.4.1/pipewire-rs-v0.4.1.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-v0.4.1/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (21 preceding siblings ...)
2022-02-24 5:47 ` classabbyamp
@ 2022-02-24 20:30 ` classabbyamp
2022-02-27 22:34 ` [PR REVIEW] " paper42
` (11 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-24 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#issuecomment-1050236462
Comment:
seem to have found a fix for the bindgen/cross issue. tested briefly on an rpi3 (aarch64-glibc)
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (22 preceding siblings ...)
2022-02-24 20:30 ` classabbyamp
@ 2022-02-27 22:34 ` paper42
2022-02-27 22:34 ` paper42
` (10 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-02-27 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#discussion_r815501311
Comment:
```suggestion
depends="pipewire"
```
gtk4 is automatically detected
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (23 preceding siblings ...)
2022-02-27 22:34 ` [PR REVIEW] " paper42
@ 2022-02-27 22:34 ` paper42
2022-02-27 22:57 ` [PR PATCH] [Updated] " classabbyamp
` (9 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-02-27 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#discussion_r815501388
Comment:
could you create a variable _pipewire_rs_version, put it next to $version and use it here?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (24 preceding siblings ...)
2022-02-27 22:34 ` paper42
@ 2022-02-27 22:57 ` classabbyamp
2022-02-27 22:58 ` [PR REVIEW] " classabbyamp
` (8 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-27 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4973 bytes --]
From 3fd35652b196661032d1de191686342a2bf93ab3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From e3f992829987183488d0e88704e7733952148bfc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 47 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..d23229e99e81
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,47 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+_pipewire_rs_version=0.4.1
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (25 preceding siblings ...)
2022-02-27 22:57 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-27 22:58 ` classabbyamp
2022-02-27 22:58 ` [PR PATCH] [Updated] " classabbyamp
` (7 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-27 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#discussion_r815504481
Comment:
done.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (26 preceding siblings ...)
2022-02-27 22:58 ` [PR REVIEW] " classabbyamp
@ 2022-02-27 22:58 ` classabbyamp
2022-03-05 23:01 ` classabbyamp
` (6 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-02-27 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4973 bytes --]
From 3fd35652b196661032d1de191686342a2bf93ab3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From e3f992829987183488d0e88704e7733952148bfc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 47 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..d23229e99e81
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,47 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+_pipewire_rs_version=0.4.1
+revision=1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (27 preceding siblings ...)
2022-02-27 22:58 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-05 23:01 ` classabbyamp
2022-03-06 3:14 ` classabbyamp
` (5 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-03-05 23:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4973 bytes --]
From 4bdfbcb137dc84ce45869704fd699caf583955f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From 2c1ae76761c2d45a15aeea2c0665be6e9173fe44 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 47 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..9b46f90f3df6
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,47 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (28 preceding siblings ...)
2022-03-05 23:01 ` classabbyamp
@ 2022-03-06 3:14 ` classabbyamp
2022-03-13 22:54 ` [PR REVIEW] " paper42
` (4 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-03-06 3:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 4973 bytes --]
From 880962f442f9ed93c094a204fa72a57b190e97a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From 458fcd8c7a434bb473e04c233da0c2b24c6cee0f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 47 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..7b87547ea8fe
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipewire/src/loop_.rs b/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/pipewire/src/loop_.rs
++++ b/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..9b46f90f3df6
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,47 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
+
+do_clean() {
+ # clean up pipewire-rs
+ rm -rf ${XBPS_BUILDDIR}/pipewire-rs-*
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (29 preceding siblings ...)
2022-03-06 3:14 ` classabbyamp
@ 2022-03-13 22:54 ` paper42
2022-03-13 23:20 ` [PR PATCH] [Updated] " classabbyamp
` (3 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-03-13 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#discussion_r825516055
Comment:
We can use create_wrksrc instead.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (30 preceding siblings ...)
2022-03-13 22:54 ` [PR REVIEW] " paper42
@ 2022-03-13 23:20 ` classabbyamp
2022-03-13 23:21 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-03-13 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 5027 bytes --]
From 880962f442f9ed93c094a204fa72a57b190e97a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From 4688b8689cff35642a522b9ddbe3efdcdb894a85 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 46 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..17f0f17f8875
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/helvum-0.3.4/pipewire/src/loop_.rs
++++ b/helvum-0.3.4/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..49ad2dd6013a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ pushd $build_wrksrc
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+ popd
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (31 preceding siblings ...)
2022-03-13 23:20 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-13 23:21 ` classabbyamp
2022-03-13 23:22 ` [PR PATCH] [Updated] " classabbyamp
2022-03-14 7:08 ` [PR PATCH] [Merged]: " paper42
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-03-13 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35591#discussion_r825519201
Comment:
this works but it causes the patch to need `/helvum-0.3.4/` added to the path. see the latest pushed version.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (32 preceding siblings ...)
2022-03-13 23:21 ` [PR REVIEW] " classabbyamp
@ 2022-03-13 23:22 ` classabbyamp
2022-03-14 7:08 ` [PR PATCH] [Merged]: " paper42
34 siblings, 0 replies; 36+ messages in thread
From: classabbyamp @ 2022-03-13 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages helvum
https://github.com/void-linux/void-packages/pull/35591
New package: helvum-0.3.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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/35591.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-helvum-35591.patch --]
[-- Type: text/x-diff, Size: 5027 bytes --]
From 01678c97961f24eed276eed8fc5cff2659fb1ea3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 1/2] common/build-helper/rust.sh: fix cross for bindgen
When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
# innocuous flags are used here just to disable its defaults
export HOST_CC="gcc"
export HOST_CFLAGS="-O2"
+
+ # Crates that use bindgen via build.rs are not cross-aware unless these are set
+ export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
else
unset CARGO_BUILD_TARGET
fi
From d1ae1a9c5130acbb48432400ce5dec1a5cbb6aea Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 2/2] New package: helvum-0.3.4
---
srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
srcpkgs/helvum/template | 46 ++++++++++++++++++++++
2 files changed, 70 insertions(+)
create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
create mode 100644 srcpkgs/helvum/template
diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..17f0f17f8875
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/helvum-0.3.4/pipewire/src/loop_.rs
++++ b/helvum-0.3.4/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+ fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+ spa_sys::timespec {
+ tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+- tv_nsec: duration.subsec_nanos().into(),
++ tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+ }
+ }
+
+--
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..49ad2dd6013a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+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${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+ pushd $build_wrksrc
+ echo "[patch.crates-io]" >> Cargo.toml
+ for crate in pipewire pipewire-sys libspa libspa-sys; do
+ mv ../pipewire-rs-*/$crate $crate
+ echo "$crate = { path = './$crate' }" >> Cargo.toml
+ done
+ popd
+}
+
+post_install() {
+ # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+ # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+ # On update, all meson.build files should be checked for changes
+ _app_id='org.pipewire.Helvum'
+ vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+ vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+ vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+ vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+ vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+ vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Merged]: New package: helvum-0.3.4
2022-02-13 18:44 [PR PATCH] New package: helvum-0.3.4 classabbyamp
` (33 preceding siblings ...)
2022-03-13 23:22 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-03-14 7:08 ` paper42
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-03-14 7:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]
There's a merged pull request on the void-packages repository
New package: helvum-0.3.4
https://github.com/void-linux/void-packages/pull/35591
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
closes #35582
closes #34560
#### 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
-->
^ permalink raw reply [flat|nested] 36+ messages in thread