Blame 0001-build-remove-positional-i18n.merge_file-arguments.patch
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
From 8c42a67695621d1e30cec933a04e633e6030bbaf Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
From: Bobby Rong <931189261@qq.com>
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
Date: Fri, 25 Mar 2022 03:14:43 +0000
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
Subject: [PATCH] build: remove positional i18n.merge_file arguments
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
Fixes build with meson 0.61
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
---
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
data/meson.build | 2 --
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
1 file changed, 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
diff --git a/data/meson.build b/data/meson.build
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
index 1a5d86f..0321c32 100644
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
--- a/data/meson.build
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
+++ b/data/meson.build
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
@@ -1,6 +1,5 @@
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
desktop = 'almanah.desktop'
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
i18n.merge_file(
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
- desktop,
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
type: 'desktop',
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
input: desktop + '.in',
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
output: desktop,
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
@@ -19,7 +18,6 @@ endif
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
appdata = 'almanah.appdata.xml'
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
i18n.merge_file(
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
- appdata,
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
input: appdata + '.in',
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
output: appdata,
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
po_dir: po_dir,
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
--
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
2.35.1
|
|
![](https://seccdn.libravatar.org/avatar/28e5f5fcf69c689ffb9e4d0b7b63444d72efe40444094281476ef63932cec29c?s=16&d=retro) |
aac7d35 |
|