mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-07 03:29:59 +00:00
gnome-disk-utility: 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:
committed by
Khem Raj
parent
4abad01d62
commit
1c4a42c09c
+34
@@ -0,0 +1,34 @@
|
|||||||
|
From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rvalue <i@rvalue.moe>
|
||||||
|
Date: Fri, 17 Dec 2021 12:29:30 +0000
|
||||||
|
Subject: [PATCH] build: fix arguments of i18n.merge_file
|
||||||
|
|
||||||
|
`i18n.merge_file` has been ignoring positional arguments for a time
|
||||||
|
and explicitly rejects with error since meson 0.60.0
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
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 e38a1d8..38fb520 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -11,7 +11,6 @@ desktops = [
|
||||||
|
|
||||||
|
foreach desktop: desktops
|
||||||
|
i18n.merge_file (
|
||||||
|
- desktop,
|
||||||
|
type: 'desktop',
|
||||||
|
input: desktop + '.in',
|
||||||
|
output: desktop,
|
||||||
|
@@ -38,7 +37,6 @@ install_data(
|
||||||
|
info = 'org.gnome.DiskUtility.appdata.xml'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- info,
|
||||||
|
input: info + '.in',
|
||||||
|
output: info,
|
||||||
|
po_dir: po_dir,
|
||||||
@@ -26,6 +26,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
|||||||
# As soon as elogind is of interest this needs rework: meson option is combo
|
# As soon as elogind is of interest this needs rework: meson option is combo
|
||||||
PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
|
PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
|
||||||
|
|
||||||
|
SRC_URI += " file://0001-build-fix-arguments-of-i18n.merge_file.patch"
|
||||||
SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df"
|
SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df"
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
|
|||||||
Reference in New Issue
Block a user