gedit: add a meson 0.61 patch

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alexander Kanavin
2022-01-21 22:38:53 +01:00
committed by Khem Raj
parent f730e51003
commit 4abad01d62
2 changed files with 35 additions and 0 deletions
@@ -0,0 +1,34 @@
From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Wed, 15 Dec 2021 07:02:09 +0000
Subject: [PATCH] Remove incorrect args for i18n.merge_file
The positional argument has been silently ignored for a time. And it causes failure
with "ERROR: Function does not take positional arguments" since meson 0.60.0
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index bb61387..28d72a1 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,7 +4,6 @@ install_man('gedit.1')
appdata = 'org.gnome.gedit.appdata.xml'
appdata_file = i18n.merge_file(
- appdata,
input: appdata + '.in',
output: appdata,
po_dir: '../po/',
@@ -23,7 +22,6 @@ endif
desktop_file = 'org.gnome.gedit.desktop'
desktop_output_file = i18n.merge_file(
- desktop_file,
type: 'desktop',
input: desktop_file + '.in',
output: desktop_file,
@@ -23,6 +23,7 @@ def gnome_verdir(v):
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch"
SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691"
# gobject-introspection is mandatory and cannot be configured