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
|
https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3
From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jeremy.bicha@canonical.com>
Date: Wed, 6 Apr 2022 13:05:25 -0400
Subject: [PATCH] meson: drop unused positional arguments
This fixes a build error with newer meson
---
data/meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 585e6d3..ed1e8bb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in',
output: 'gnome-nettool.desktop.in',
configuration: desktop_conf)
-i18n.merge_file('desktop',
- type: 'desktop',
+i18n.merge_file(type: 'desktop',
input: desktop_in,
output: 'gnome-nettool.desktop',
po_dir: po_dir,
install: true,
install_dir: join_paths(prefix, datadir, 'applications'))
-i18n.merge_file('appdata',
- type: 'xml',
+i18n.merge_file(type: 'xml',
input: 'gnome-nettool.appdata.xml.in',
output: 'gnome-nettool.appdata.xml',
po_dir: po_dir,
--
GitLab
|