47 lines
1.1 KiB
Diff
47 lines
1.1 KiB
Diff
|
From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Vasilek <michal@vasilek.cz>
|
||
|
|
Date: Sat, 22 Jan 2022 23:16:37 +0100
|
||
|
|
Subject: [PATCH] meson: fix build with meson 0.61
|
||
|
|
|
||
|
|
i18n.merge_file doesn't accept positional arguments
|
||
|
|
---
|
||
|
|
data/appdata/meson.build | 1 -
|
||
|
|
data/meson.build | 2 --
|
||
|
|
2 files changed, 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
|
||
|
|
index 48a31e3..d78d052 100644
|
||
|
|
--- a/data/appdata/meson.build
|
||
|
|
+++ b/data/appdata/meson.build
|
||
|
|
@@ -1,7 +1,6 @@
|
||
|
|
info = 'org.gnome.Notes.appdata.xml'
|
||
|
|
|
||
|
|
i18n.merge_file(
|
||
|
|
- info,
|
||
|
|
input: info + '.in',
|
||
|
|
output: info,
|
||
|
|
po_dir: po_dir,
|
||
|
|
diff --git a/data/meson.build b/data/meson.build
|
||
|
|
index d00d98f..556d564 100644
|
||
|
|
--- a/data/meson.build
|
||
|
|
+++ b/data/meson.build
|
||
|
|
@@ -4,7 +4,6 @@ subdir('appdata')
|
||
|
|
mime = 'org.gnome.Notes.xml'
|
||
|
|
|
||
|
|
i18n.merge_file(
|
||
|
|
- mime,
|
||
|
|
input: mime + '.in',
|
||
|
|
output: mime,
|
||
|
|
po_dir: po_dir,
|
||
|
|
@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
|
||
|
|
desktop_conf.set ('icon', application_id)
|
||
|
|
|
||
|
|
i18n.merge_file(
|
||
|
|
- desktop,
|
||
|
|
type: 'desktop',
|
||
|
|
input: configure_file(
|
||
|
|
input: files (desktop + '.in'),
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|