diff --git a/srcpkgs/fractal/patches/cargo-update-glycin.patch b/srcpkgs/fractal/patches/cargo-update-glycin.patch new file mode 100644 index 00000000000..70c55c2de5e --- /dev/null +++ b/srcpkgs/fractal/patches/cargo-update-glycin.patch @@ -0,0 +1,53 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5f8fb780c954..1192ef7c4ea0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1078,7 +1078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" + dependencies = [ + "libc", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1629,7 +1629,7 @@ dependencies = [ + "gobject-sys", + "libc", + "system-deps", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1709,9 +1709,9 @@ dependencies = [ + + [[package]] + name = "glycin" +-version = "3.0.4" ++version = "3.0.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70036c016aba916ccf079a5f0149027c4016d6a5fdaae09019a77e93062f2bd3" ++checksum = "502ac59dc785b95521e7deea20e292f3501a11752600c4f37cf34676f794b4e3" + dependencies = [ + "futures-channel", + "futures-util", +@@ -4571,7 +4571,7 @@ dependencies = [ + "errno", + "libc", + "linux-raw-sys", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -5093,7 +5093,7 @@ dependencies = [ + "getrandom 0.3.4", + "once_cell", + "rustix", +- "windows-sys 0.61.2", ++ "windows-sys 0.52.0", + ] + + [[package]] + diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template index 53531bd2116..611432b49c4 100644 --- a/srcpkgs/fractal/template +++ b/srcpkgs/fractal/template @@ -1,11 +1,11 @@ # Template file for 'fractal' pkgname=fractal -version=11.1 +version=13 revision=1 build_style=meson build_helper=rust hostmakedepends="cargo clang desktop-file-utils gettext glib-devel - gtk4-update-icon-cache nodejs pkg-config" + gtk4-update-icon-cache nodejs pkg-config blueprint-compiler" makedepends="gst-plugins-base1-devel gtksourceview5-devel libadwaita-devel libseccomp-devel libshumate-devel pipewire-devel rust-std xdg-desktop-portal libwebp-devel" @@ -16,29 +16,41 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Fractal" changelog="https://gitlab.gnome.org/World/fractal/-/releases" distfiles="https://gitlab.gnome.org/World/fractal/-/archive/${version}/fractal-${version}.tar.gz" -checksum=64b84201976818d148a20351e4fcccc426739ccbfba485b911ca7625c559338f +checksum=fae738e94f7ec9eb03712ddc0b9792397ea268bae859eaff5814a093953c7402 export PATH="$PATH:$XBPS_BUILDDIR/${pkgname}-${version}/node_modules/.bin" -if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then - broken="runs out of memory when linking" -fi -nocross=yes -if [ "$XBPS_TARGET_LIBC" = musl ]; then - broken="broken" -fi +case "$XBPS_TARGET_MACHINE" in + i686*) broken="runs out of memory when linking" ;; +esac post_patch() { if [ "$CROSS_BUILD" ]; then vsed -i src/meson.build \ -e "s%rust_target /%'${RUST_TARGET}' / &%" fi + # this package uses stupid amounts of memory when allowed to do LTO + # also, by setting codegen-units to 1, upstream tries to optimise more + # but just ends up using more memory + # disable debug information generation to further lower memory usage + vsed -i Cargo.toml -e 's/lto = "thin"/lto = "off"/; /codegen-units/d; s/debug = true/debug = false/' } pre_configure() { npm i sass } +pre_build() { + if [ "$CROSS_BUILD" ]; then + export GI_TYPELIB_PATH="${XBPS_CROSS_BASE}/usr/lib/girepository-1.0" + fi +} + +# NOTE: explicitly prevent rebuild due to XBPS wrappers being regenerated +do_check() { + meson test -C build --no-rebuild ${makejobs} +} + # NOTE: explicitly prevent rebuild: https://gitlab.gnome.org/GNOME/fractal/-/issues/1327 do_install() { meson install -C build --destdir $DESTDIR --no-rebuild