summaryrefslogtreecommitdiff
path: root/games-puzzle/gnome-sudoku/files/40.2-fix-build-with-meson-0.61.1.patch
blob: 02d125685ac1124bb0ceec0295bfde4d98104dac (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a
https://bugs.gentoo.org/831556

From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:44:06 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()

Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.

data/meson.build:5:0: ERROR: Function does not take positional arguments.
data/meson.build:24:0: ERROR: Function does not take positional arguments.
---
 data/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index f18f247..9c95e02 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
 
 resources = gnome.compile_resources('gnome-sudoku', resource_files)
 
-desktop_file = i18n.merge_file('desktop',
+desktop_file = i18n.merge_file(
   input: '@0@.desktop.in'.format(application_id),
   output: '@0@.desktop'.format(application_id),
   install: true,
@@ -21,7 +21,7 @@ if desktop_file_validate.found()
   )
 endif
 
-appdata_file = i18n.merge_file('appdata',
+appdata_file = i18n.merge_file(
   input: '@0@.appdata.xml.in'.format(application_id),
   output: '@0@.appdata.xml'.format(application_id),
   install: true,
-- 
GitLab