fractal: update to 4.4.2

This commit is contained in:
dkwo 2023-02-13 15:03:45 -05:00 committed by Duncan Overbruck
parent 7f56cd412a
commit f90c6d6e91
2 changed files with 2 additions and 44 deletions

View File

@ -1,35 +0,0 @@
From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
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

View File

@ -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,7 +14,7 @@ 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=33d8b5303f9309bc4a29bdcabe263f316cfb8805b50d7f4b6b2f0a0a7dd9efaf
checksum=97bb2f355fb1a89851bf16c17aed63063c6c0a79d8adcd31ce0ab82bc4a56f5e
post_patch() {
[ -z "$CROSS_BUILD" ] && return 0
@ -23,10 +23,3 @@ post_patch() {
-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
}