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