From 36925690d7f81acaa2d8a0b476917c11e6a67142 Mon Sep 17 00:00:00 2001 From: dkwo Date: Mon, 13 Feb 2023 15:03:45 -0500 Subject: [PATCH] fractal: update to 4.4.2 --- srcpkgs/fractal/patches/meson-0.61.patch | 35 ------------------------ srcpkgs/fractal/template | 19 ++----------- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 srcpkgs/fractal/patches/meson-0.61.patch diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch deleted file mode 100644 index 79197803abf5..000000000000 --- a/srcpkgs/fractal/patches/meson-0.61.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001 -From: Jonas Platte -Date: Sun, 31 Oct 2021 15:23:31 +0100 -Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file - -See https://github.com/mesonbuild/meson/issues/9441 ---- - fractal-gtk/res/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build -index 7a7a7d65..a176787c 100644 ---- a/fractal-gtk/res/meson.build -+++ b/fractal-gtk/res/meson.build -@@ -2,7 +2,7 @@ subdir('icons') - - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) --desktop_file = i18n.merge_file ('desktop-file', -+desktop_file = i18n.merge_file ( - type: 'desktop', - input: configure_file( - input: files('org.gnome.Fractal.desktop.in.in'), -@@ -28,7 +28,7 @@ endif - - metainfo_conf = configuration_data() - metainfo_conf.set('appid', application_id) --metainfo_file = i18n.merge_file ('metainfo-file', -+metainfo_file = i18n.merge_file ( - input: configure_file( - input: files('org.gnome.Fractal.metainfo.xml.in.in'), - output: 'org.gnome.Fractal.metainfo.xml.in', --- -GitLab - diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template index fe462fc6e2d2..f50ee73848d6 100644 --- a/srcpkgs/fractal/template +++ b/srcpkgs/fractal/template @@ -1,6 +1,6 @@ # Template file for 'fractal' pkgname=fractal -version=4.4.0 +version=4.4.2 revision=1 build_style=meson build_helper="rust" @@ -14,19 +14,4 @@ maintainer="Cameron Nemo " 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=33d8b5303f9309bc4a29bdcabe263f316cfb8805b50d7f4b6b2f0a0a7dd9efaf - -post_patch() { - [ -z "$CROSS_BUILD" ] && return 0 - - vsed -i scripts/cargo.sh \ - -e 's;"$CARGO_TARGET_DIR";&/${RUST_TARGET};' \ - -e '/CARGO_HOME/d' -} - -pre_build() { - # fixes an indexmap error when cross compiling - cargo update --package autocfg:1.0.0 --precise 1.1.0 - cargo update --package autocfg:0.1.7 --precise 0.1.8 - cargo update --package socket2 --precise 0.3.19 -} +checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e