Skip to content

Commit 7e17cc8

Browse files
committed
fractal: update to 13.
closes: #58453 [via git-merge-pr]
1 parent fb53b72 commit 7e17cc8

File tree

2 files changed

+75
-10
lines changed

2 files changed

+75
-10
lines changed
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
diff --git a/Cargo.lock b/Cargo.lock
2+
index 5f8fb780c954..1192ef7c4ea0 100644
3+
--- a/Cargo.lock
4+
+++ b/Cargo.lock
5+
@@ -1078,7 +1078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
6+
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
7+
dependencies = [
8+
"libc",
9+
- "windows-sys 0.61.2",
10+
+ "windows-sys 0.52.0",
11+
]
12+
13+
[[package]]
14+
@@ -1629,7 +1629,7 @@ dependencies = [
15+
"gobject-sys",
16+
"libc",
17+
"system-deps",
18+
- "windows-sys 0.61.2",
19+
+ "windows-sys 0.52.0",
20+
]
21+
22+
[[package]]
23+
@@ -1709,9 +1709,9 @@ dependencies = [
24+
25+
[[package]]
26+
name = "glycin"
27+
-version = "3.0.4"
28+
+version = "3.0.7"
29+
source = "registry+https://github.com/rust-lang/crates.io-index"
30+
-checksum = "70036c016aba916ccf079a5f0149027c4016d6a5fdaae09019a77e93062f2bd3"
31+
+checksum = "502ac59dc785b95521e7deea20e292f3501a11752600c4f37cf34676f794b4e3"
32+
dependencies = [
33+
"futures-channel",
34+
"futures-util",
35+
@@ -4571,7 +4571,7 @@ dependencies = [
36+
"errno",
37+
"libc",
38+
"linux-raw-sys",
39+
- "windows-sys 0.61.2",
40+
+ "windows-sys 0.52.0",
41+
]
42+
43+
[[package]]
44+
@@ -5093,7 +5093,7 @@ dependencies = [
45+
"getrandom 0.3.4",
46+
"once_cell",
47+
"rustix",
48+
- "windows-sys 0.61.2",
49+
+ "windows-sys 0.52.0",
50+
]
51+
52+
[[package]]
53+

srcpkgs/fractal/template

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Template file for 'fractal'
22
pkgname=fractal
3-
version=11.1
3+
version=13
44
revision=1
55
build_style=meson
66
build_helper=rust
77
hostmakedepends="cargo clang desktop-file-utils gettext glib-devel
8-
gtk4-update-icon-cache nodejs pkg-config"
8+
gtk4-update-icon-cache nodejs pkg-config blueprint-compiler"
99
makedepends="gst-plugins-base1-devel gtksourceview5-devel libadwaita-devel
1010
libseccomp-devel libshumate-devel pipewire-devel rust-std xdg-desktop-portal
1111
libwebp-devel"
@@ -16,29 +16,41 @@ license="GPL-3.0-or-later"
1616
homepage="https://wiki.gnome.org/Apps/Fractal"
1717
changelog="https://gitlab.gnome.org/World/fractal/-/releases"
1818
distfiles="https://gitlab.gnome.org/World/fractal/-/archive/${version}/fractal-${version}.tar.gz"
19-
checksum=64b84201976818d148a20351e4fcccc426739ccbfba485b911ca7625c559338f
19+
checksum=fae738e94f7ec9eb03712ddc0b9792397ea268bae859eaff5814a093953c7402
2020

2121
export PATH="$PATH:$XBPS_BUILDDIR/${pkgname}-${version}/node_modules/.bin"
2222

23-
if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
24-
broken="runs out of memory when linking"
25-
fi
26-
nocross=yes
27-
if [ "$XBPS_TARGET_LIBC" = musl ]; then
28-
broken="broken"
29-
fi
23+
case "$XBPS_TARGET_MACHINE" in
24+
i686*) broken="runs out of memory when linking" ;;
25+
esac
3026

3127
post_patch() {
3228
if [ "$CROSS_BUILD" ]; then
3329
vsed -i src/meson.build \
3430
-e "s%rust_target /%'${RUST_TARGET}' / &%"
3531
fi
32+
# this package uses stupid amounts of memory when allowed to do LTO
33+
# also, by setting codegen-units to 1, upstream tries to optimise more
34+
# but just ends up using more memory
35+
# disable debug information generation to further lower memory usage
36+
vsed -i Cargo.toml -e 's/lto = "thin"/lto = "off"/; /codegen-units/d; s/debug = true/debug = false/'
3637
}
3738

3839
pre_configure() {
3940
npm i sass
4041
}
4142

43+
pre_build() {
44+
if [ "$CROSS_BUILD" ]; then
45+
export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0"
46+
fi
47+
}
48+
49+
# NOTE: explicitly prevent rebuild due to XBPS wrappers being regenerated
50+
do_check() {
51+
meson test -C build --no-rebuild ${makejobs}
52+
}
53+
4254
# NOTE: explicitly prevent rebuild: https://gitlab.gnome.org/GNOME/fractal/-/issues/1327
4355
do_install() {
4456
meson install -C build --destdir $DESTDIR --no-rebuild

0 commit comments

Comments
 (0)