mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
network-manager-applet: add 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
5ef3712860
commit
82598c081c
+31
@@ -0,0 +1,31 @@
|
|||||||
|
From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
Date: Fri, 21 Jan 2022 22:34:09 +0100
|
||||||
|
Subject: [PATCH] meson.build: address meson 0.61 failures
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
meson.build | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 7ab613c8..688a7311 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
|
||||||
|
|
||||||
|
foreach desktop: desktop_files
|
||||||
|
i18n.merge_file(
|
||||||
|
- desktop + '-desktop',
|
||||||
|
input: desktop + '.desktop.in',
|
||||||
|
output: desktop + '.desktop',
|
||||||
|
install: true,
|
||||||
|
@@ -274,7 +273,6 @@ endforeach
|
||||||
|
appdata = 'nm-connection-editor.appdata.xml'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- 'desktop',
|
||||||
|
input: appdata + '.in',
|
||||||
|
output: appdata,
|
||||||
|
install: true,
|
||||||
+1
@@ -9,6 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext
|
|||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
|
|
||||||
|
SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch"
|
||||||
SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58"
|
SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58"
|
||||||
|
|
||||||
# We don't not have ubuntu's appindicator (yet?)
|
# We don't not have ubuntu's appindicator (yet?)
|
||||||
|
|||||||
Reference in New Issue
Block a user