mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-12 05:11:59 +00:00
gnome-terminal: backport 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
fc9b8db9e6
commit
3e717877f8
+46
@@ -0,0 +1,46 @@
|
|||||||
|
From f88447850e162c8d514be367db574c6fa2fec2a5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Persch <chpe@src.gnome.org>
|
||||||
|
Date: Fri, 14 Jan 2022 11:33:32 +0100
|
||||||
|
Subject: [PATCH] build: Fix for newer meson
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
data/meson.build | 5 +----
|
||||||
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 79d97e5..e0bcbb9 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -18,7 +18,6 @@
|
||||||
|
metainfodir = gt_datadir / 'metainfo'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- gt_dns_name + '.metainfo.xml',
|
||||||
|
input: gt_dns_name + '.metainfo.xml.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
|
po_dir: po_dir,
|
||||||
|
@@ -27,7 +26,6 @@ i18n.merge_file(
|
||||||
|
)
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- gt_dns_name + '.Nautilus.metainfo.xml',
|
||||||
|
input: gt_dns_name + '.Nautilus.metainfo.xml.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
|
po_dir: po_dir,
|
||||||
|
@@ -40,7 +38,6 @@ i18n.merge_file(
|
||||||
|
desktopdatadir = gt_datadir / 'applications'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- gt_dns_name + '.desktop',
|
||||||
|
input: gt_dns_name + '.desktop.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
|
type: 'desktop',
|
||||||
|
@@ -57,4 +54,4 @@ meson.add_install_script(
|
||||||
|
|
||||||
|
# Subdirs
|
||||||
|
|
||||||
|
-subdir('icons')
|
||||||
|
\ No newline at end of file
|
||||||
|
+subdir('icons')
|
||||||
@@ -24,6 +24,7 @@ DEPENDS = " \
|
|||||||
|
|
||||||
SRC_URI[archive.sha256sum] = "8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0"
|
SRC_URI[archive.sha256sum] = "8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0"
|
||||||
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
|
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
|
||||||
|
SRC_URI += " file://0001-build-Fix-for-newer-meson.patch"
|
||||||
|
|
||||||
EXTRA_OEMESON += " \
|
EXTRA_OEMESON += " \
|
||||||
-Dsearch_provider=false \
|
-Dsearch_provider=false \
|
||||||
|
|||||||
Reference in New Issue
Block a user