2022-04-20 14:50:41 +02:00
|
|
|
From 994af76ce5144062d55d141129bf6bf5fab002ee Mon Sep 17 00:00:00 2001
|
2022-02-03 22:51:08 +01:00
|
|
|
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 48a31e3c..d78d052f 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 d00d98f1..556d5642 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'),
|
|
|
|
|
--
|
|
|
|
|
GitLab
|
|
|
|
|
|
