35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
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
|
|
|