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
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
|
From 90715329c277f21537eb5af86d8f222c4a2abd24 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 7 Jan 2022 01:53:52 +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.
panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments.
panels/background/meson.build:10:5: ERROR: Function does not take positional arguments.
panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments.
[...]
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
panels/applications/meson.build | 1 -
panels/background/meson.build | 1 -
panels/bluetooth/meson.build | 1 -
panels/camera/meson.build | 1 -
panels/color/meson.build | 1 -
panels/datetime/meson.build | 2 --
panels/default-apps/meson.build | 1 -
panels/diagnostics/meson.build | 1 -
panels/display/meson.build | 1 -
panels/info-overview/meson.build | 1 -
panels/keyboard/meson.build | 2 --
panels/location/meson.build | 1 -
panels/lock/meson.build | 1 -
panels/microphone/meson.build | 1 -
panels/mouse/meson.build | 1 -
panels/multitasking/meson.build | 1 -
panels/network/meson.build | 1 -
panels/notifications/meson.build | 1 -
panels/online-accounts/meson.build | 1 -
panels/power/meson.build | 1 -
panels/printers/meson.build | 1 -
panels/region/meson.build | 1 -
panels/removable-media/meson.build | 1 -
panels/search/meson.build | 1 -
panels/sharing/meson.build | 2 --
panels/sound/meson.build | 1 -
panels/thunderbolt/meson.build | 1 -
panels/universal-access/meson.build | 1 -
panels/usage/meson.build | 1 -
panels/user-accounts/meson.build | 2 --
panels/wacom/meson.build | 1 -
panels/wwan/meson.build | 1 -
shell/appdata/meson.build | 1 -
shell/meson.build | 1 -
tests/interactive-panels/applications/meson.build | 1 -
35 files changed, 39 deletions(-)
diff --git a/panels/applications/meson.build b/panels/applications/meson.build
index d511bf6..bd4fd64 100644
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
diff --git a/panels/background/meson.build b/panels/background/meson.build
index 730cf54..1f231b9 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build
index c3fce74..4bed812 100644
--- a/panels/bluetooth/meson.build
+++ b/panels/bluetooth/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/camera/meson.build b/panels/camera/meson.build
index 4f26118..bf2e727 100644
--- a/panels/camera/meson.build
+++ b/panels/camera/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/color/meson.build b/panels/color/meson.build
index 742caf6..bb038cd 100644
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
index 6568394..9bbdc7c 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
@@ -20,7 +19,6 @@ i18n.merge_file(
polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)
i18n.merge_file(
- polkit,
input: polkit + '.in',
output: polkit,
po_dir: po_dir,
diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build
index 6855006..2a24321 100644
--- a/panels/default-apps/meson.build
+++ b/panels/default-apps/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build
index fac9b4c..2f25c21 100644
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/display/meson.build b/panels/display/meson.build
index 12f35cc..57bdfcf 100644
--- a/panels/display/meson.build
+++ b/panels/display/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build
index 2fe10b3..aa81c48 100644
--- a/panels/info-overview/meson.build
+++ b/panels/info-overview/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build
index a2ae026..ae71c94 100644
--- a/panels/keyboard/meson.build
+++ b/panels/keyboard/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
@@ -45,7 +44,6 @@ xml_files = [
foreach file: xml_files
i18n.merge_file(
- file,
input: file + '.in',
output: file,
po_dir: po_dir,
diff --git a/panels/location/meson.build b/panels/location/meson.build
index bfc6e82..f4c835d 100644
--- a/panels/location/meson.build
+++ b/panels/location/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/lock/meson.build b/panels/lock/meson.build
index 0661af4..18dbfb2 100644
--- a/panels/lock/meson.build
+++ b/panels/lock/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build
index e0847a4..bc7f73a 100644
--- a/panels/microphone/meson.build
+++ b/panels/microphone/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build
index 357aaae..7b46097 100644
--- a/panels/mouse/meson.build
+++ b/panels/mouse/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build
index 772b638..53fd0d8 100644
--- a/panels/multitasking/meson.build
+++ b/panels/multitasking/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/network/meson.build b/panels/network/meson.build
index d7cd6e4..43a5690 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -25,7 +25,6 @@ foreach name: panel_names
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build
index df70261..1b04b24 100644
--- a/panels/notifications/meson.build
+++ b/panels/notifications/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build
index 82f1d56..6870977 100644
--- a/panels/online-accounts/meson.build
+++ b/panels/online-accounts/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/power/meson.build b/panels/power/meson.build
index 0e3ea1d..1cafe2a 100644
--- a/panels/power/meson.build
+++ b/panels/power/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/printers/meson.build b/panels/printers/meson.build
index ccce64c..042c67a 100644
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/region/meson.build b/panels/region/meson.build
index 68b7f00..27bc5ff 100644
--- a/panels/region/meson.build
+++ b/panels/region/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build
index b51799a..fc07c48 100644
--- a/panels/removable-media/meson.build
+++ b/panels/removable-media/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/search/meson.build b/panels/search/meson.build
index 39b076b..a4dd79d 100644
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build
index b3803bc..49dbb06 100644
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
@@ -29,7 +28,6 @@ polkit_in = configure_file(
)
i18n.merge_file(
- polkit,
input: polkit_in,
output: polkit,
po_dir: po_dir,
diff --git a/panels/sound/meson.build b/panels/sound/meson.build
index fa0f128..18f75dd 100644
--- a/panels/sound/meson.build
+++ b/panels/sound/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build
index 53aa9b4..38ef294 100644
--- a/panels/thunderbolt/meson.build
+++ b/panels/thunderbolt/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build
index 5e225fe..d845e70 100644
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/usage/meson.build b/panels/usage/meson.build
index 74f720e..6047ce0 100644
--- a/panels/usage/meson.build
+++ b/panels/usage/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index b8ee9d9..fa56aae 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -8,7 +8,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c',
polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)
i18n.merge_file(
- polkit,
input: polkit + '.in',
output: polkit,
po_dir: po_dir,
diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build
index 5f62220..88a9137 100644
--- a/panels/wacom/meson.build
+++ b/panels/wacom/meson.build
@@ -30,7 +30,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build
index 8c1b02f..2ab238a 100644
--- a/panels/wwan/meson.build
+++ b/panels/wwan/meson.build
@@ -11,7 +11,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build
index 3b36171..fdb8279 100644
--- a/shell/appdata/meson.build
+++ b/shell/appdata/meson.build
@@ -1,7 +1,6 @@
appdata = 'gnome-control-center.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
output: appdata,
po_dir: po_dir,
diff --git a/shell/meson.build b/shell/meson.build
index 89b9659..4667804 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -23,7 +23,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type : 'desktop',
input : desktop_in,
output : desktop,
diff --git a/tests/interactive-panels/applications/meson.build b/tests/interactive-panels/applications/meson.build
index 2657f95..82eed4d 100644
--- a/tests/interactive-panels/applications/meson.build
+++ b/tests/interactive-panels/applications/meson.build
@@ -12,7 +12,6 @@ desktop_files = [
foreach desktop_file : desktop_files
i18n.merge_file(
- desktop,
type : 'desktop',
input : 'gtp-@0@.desktop.in'.format(desktop_file),
output : 'gnome-@0@-panel.desktop'.format(desktop_file),
|
