* [PR PATCH] fractal: update to 6
@ 2024-01-26 22:13 chrysos349
2024-01-26 23:15 ` chrysos349
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: chrysos349 @ 2024-01-26 22:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is a new pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages fractal
https://github.com/void-linux/void-packages/pull/48389
fractal: update to 6
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- aarch64 x
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48389.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fractal-48389.patch --]
[-- Type: text/x-diff, Size: 2504 bytes --]
From e5f275cc8460c3edc5917fcc4064694acdf7173c Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 27 Jan 2024 01:11:16 +0300
Subject: [PATCH] fractal: update to 6
---
common/shlibs | 1 +
srcpkgs/fractal/template | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 27763bf428b75..2d3f9f760be22 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,4 @@ libsqsh.so.1 libsqsh-1.3.0_1
libunicode.so.0.4 libunicode-0.4.0_1
libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
+libgstplay-1.0.so.0 gst-plugins-bad1-1.22.7_1
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index 5012cf23587b4..bbb85be7f38b0 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,25 +1,29 @@
# Template file for 'fractal'
pkgname=fractal
-version=4.4.2
-revision=2
+version=6
+revision=1
build_style=meson
-build_helper="rust"
-hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
- cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
- gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
- gmp-devel libsecret-devel libhandy-devel rust-std"
+build_helper=rust
+hostmakedepends="cargo clang desktop-file-utils gettext glib-devel
+ gtk-update-icon-cache pkg-config"
+makedepends="gst-plugins-base1-devel gtksourceview5-devel libadwaita-devel
+ libshumate-devel pipewire-devel rust-std"
short_desc="Matrix Messaging Client for GNOME"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
-distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+distfiles="https://gitlab.gnome.org/World/fractal/-/archive/${version}/fractal-${version}.tar.gz"
+checksum=a730dffe5fd4859c16e0d84244a82f6ea843d4e464ee04e08fcb5bea61c248f2
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i64"
+fi
post_patch() {
- [ -z "$CROSS_BUILD" ] && return 0
+ vsed -i "/xdg-desktop-portal/d" meson.build
- vsed -i scripts/cargo.sh \
- -e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
- -e '/CARGO_HOME/d'
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+ fi
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: fractal: update to 6
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
@ 2024-01-26 23:15 ` chrysos349
2024-01-27 0:19 ` CameronNemo
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: chrysos349 @ 2024-01-26 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48389#issuecomment-1912816292
Comment:
I guess x86_64 build failed due to "out of memory" error or something. There's nothing I can do here.
It compiled fine on my local machine. But it took ages!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: fractal: update to 6
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
2024-01-26 23:15 ` chrysos349
@ 2024-01-27 0:19 ` CameronNemo
2024-02-26 10:04 ` [PR PATCH] [Updated] " chrysos349
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: CameronNemo @ 2024-01-27 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/48389#issuecomment-1912861312
Comment:
@chrysos349 I would ask in the #xbps IRC channel about this case. Looks maybe a bit atypical. I am not up to date on the latest void-packages custom, though.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] fractal: update to 6
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
2024-01-26 23:15 ` chrysos349
2024-01-27 0:19 ` CameronNemo
@ 2024-02-26 10:04 ` chrysos349
2024-03-20 23:03 ` chrysos349
2024-05-24 21:47 ` [PR PATCH] [Closed]: " chrysos349
4 siblings, 0 replies; 6+ messages in thread
From: chrysos349 @ 2024-02-26 10:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages fractal
https://github.com/void-linux/void-packages/pull/48389
fractal: update to 6
@CameronNemo
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- aarch64 x
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48389.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fractal-48389.patch --]
[-- Type: text/x-diff, Size: 2519 bytes --]
From ee25b5368be0a2294f10a277378adf9e988e355b Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 27 Jan 2024 01:11:16 +0300
Subject: [PATCH] fractal: update to 6
---
common/shlibs | 1 +
srcpkgs/fractal/template | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d0ee0cdd9401a5..0ef327b749251d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4284,3 +4284,4 @@ libunicode_ucd.so.0.4 libunicode-0.4.0_1
libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
+libgstplay-1.0.so.0 gst-plugins-bad1-1.22.7_1
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index 5012cf23587b40..bbb85be7f38b0e 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,25 +1,29 @@
# Template file for 'fractal'
pkgname=fractal
-version=4.4.2
-revision=2
+version=6
+revision=1
build_style=meson
-build_helper="rust"
-hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
- cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
- gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
- gmp-devel libsecret-devel libhandy-devel rust-std"
+build_helper=rust
+hostmakedepends="cargo clang desktop-file-utils gettext glib-devel
+ gtk-update-icon-cache pkg-config"
+makedepends="gst-plugins-base1-devel gtksourceview5-devel libadwaita-devel
+ libshumate-devel pipewire-devel rust-std"
short_desc="Matrix Messaging Client for GNOME"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
-distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+distfiles="https://gitlab.gnome.org/World/fractal/-/archive/${version}/fractal-${version}.tar.gz"
+checksum=a730dffe5fd4859c16e0d84244a82f6ea843d4e464ee04e08fcb5bea61c248f2
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="uses i64"
+fi
post_patch() {
- [ -z "$CROSS_BUILD" ] && return 0
+ vsed -i "/xdg-desktop-portal/d" meson.build
- vsed -i scripts/cargo.sh \
- -e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
- -e '/CARGO_HOME/d'
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
+ fi
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] fractal: update to 6
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
` (2 preceding siblings ...)
2024-02-26 10:04 ` [PR PATCH] [Updated] " chrysos349
@ 2024-03-20 23:03 ` chrysos349
2024-05-24 21:47 ` [PR PATCH] [Closed]: " chrysos349
4 siblings, 0 replies; 6+ messages in thread
From: chrysos349 @ 2024-03-20 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages fractal
https://github.com/void-linux/void-packages/pull/48389
fractal: update to 6
@CameronNemo
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- aarch64 x
- x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/48389.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fractal-48389.patch --]
[-- Type: text/x-diff, Size: 2521 bytes --]
From 29d441f50cfeb94153eaf6ab8e7f85d54aa751e3 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Sat, 27 Jan 2024 01:11:16 +0300
Subject: [PATCH] fractal: update to 6
---
common/shlibs | 1 +
srcpkgs/fractal/template | 32 ++++++++++++++++++--------------
2 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cc85a48ce8f207..d0c512ba1c9fa5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4300,3 +4300,4 @@ libunicode_loader.so.0.4 libunicode-0.4.0_1
force-stage.so.0.1 void-force-stage-0.1_1
libliftoff.so.0 libliftoff-0.4.1_1
libscfg.so libscfg-0.1.1_1
+libgstplay-1.0.so.0 gst-plugins-bad1-1.22.9_1
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index 5012cf23587b40..4e405ea56c8789 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,25 +1,29 @@
# Template file for 'fractal'
pkgname=fractal
-version=4.4.2
-revision=2
+version=6
+revision=1
build_style=meson
-build_helper="rust"
-hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
- cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
- gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
- gmp-devel libsecret-devel libhandy-devel rust-std"
+build_helper=rust
+hostmakedepends="cargo clang desktop-file-utils gettext glib-devel
+ gtk-update-icon-cache pkg-config"
+makedepends="gst-plugins-base1-devel gtksourceview5-devel libadwaita-devel
+ libshumate-devel pipewire-devel rust-std"
short_desc="Matrix Messaging Client for GNOME"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Fractal"
-distfiles="https://gitlab.gnome.org/GNOME/fractal/-/archive/${version}/fractal-${version}.tar.gz"
-checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
+distfiles="https://gitlab.gnome.org/World/fractal/-/archive/${version}/fractal-${version}.tar.gz"
+checksum=a730dffe5fd4859c16e0d84244a82f6ea843d4e464ee04e08fcb5bea61c248f2
+
+if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
+ broken="limited by Rust + crate dependencies"
+fi
post_patch() {
- [ -z "$CROSS_BUILD" ] && return 0
+ vsed -i "/xdg-desktop-portal/d" meson.build
- vsed -i scripts/cargo.sh \
- -e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \
- -e '/CARGO_HOME/d'
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / &%"
+ fi
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: fractal: update to 6
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
` (3 preceding siblings ...)
2024-03-20 23:03 ` chrysos349
@ 2024-05-24 21:47 ` chrysos349
4 siblings, 0 replies; 6+ messages in thread
From: chrysos349 @ 2024-05-24 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
There's a closed pull request on the void-packages repository
fractal: update to 6
https://github.com/void-linux/void-packages/pull/48389
Description:
@CameronNemo
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- aarch64 x
- x86_64-musl
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-24 21:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-26 22:13 [PR PATCH] fractal: update to 6 chrysos349
2024-01-26 23:15 ` chrysos349
2024-01-27 0:19 ` CameronNemo
2024-02-26 10:04 ` [PR PATCH] [Updated] " chrysos349
2024-03-20 23:03 ` chrysos349
2024-05-24 21:47 ` [PR PATCH] [Closed]: " chrysos349
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).