[12/19] gnome-calendar: fix meson 0.61 builds

Message ID	20220121213858.762625-12-alex@linutronix.de
State	New
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin <alex@linutronix.de> Subject: [PATCH 12/19] gnome-calendar: fix meson 0.61 builds Date: Fri, 21 Jan 2022 22:38:51 +0100 Message-Id: <20220121213858.762625-12-alex@linutronix.de> In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/19] gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61 \| expand [01/19] gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61 [02/19] gjs: drop patch to satisfy meson 0.61 [03/19] gnome-terminal: backport a meson 0.61 patch [04/19] gnome-bluetooth: backport a meson 0.61 patch [05/19] gnome-font-viewer: backport a meson 0.61 patch [06/19] gnome-session: update 40.1.1 -> 41.3 [07/19] gnome-settings-daemon: add a meson 0.61 patch [08/19] gnome-shell: backport a meson 0.61 patch [09/19] accountsservice: backport a meson 0.61 patch [10/19] gnome-screenshot: backport a meson 0.61 patch [11/19] evince: fix meson 0.61 builds [12/19] gnome-calendar: fix meson 0.61 builds [13/19] gthumb: fix meson 0.61 builds [14/19] gedit: add a meson 0.61 patch [15/19] gnome-disk-utility: add a meson 0.61 patch [16/19] gnome-control-center: add a meson 0.61 patch [17/19] gnome-photos: add a meson 0.61 patch [18/19] dconf-editor: add a meson 0.61 patch [19/19] network-manager-applet: add meson 0.61 patch

Message ID

20220121213858.762625-12-alex@linutronix.de

State

New

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 12/19] gnome-calendar: fix meson 0.61 builds
Date: Fri, 21 Jan 2022 22:38:51 +0100
Message-Id: <20220121213858.762625-12-alex@linutronix.de>
In-Reply-To: <20220121213858.762625-1-alex@linutronix.de>
References: <20220121213858.762625-1-alex@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/19] gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61 | expand

Commit Message

Alexander Kanavin Jan. 21, 2022, 9:38 p.m. UTC

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...01-meson.build-fix-meson-0.61-builds.patch | 23 +++++++++++++++++++
 .../gnome-calendar/gnome-calendar_41.2.bb     |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch

diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch
new file mode 100644
index 000000000..8ec980bb1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch
@@ -0,0 +1,23 @@ 
+From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 21:18:39 +0100
+Subject: [PATCH] meson.build: fix meson 0.61 builds
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ data/appdata/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index b5ee6540..200c3507 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Calendar.appdata.xml.in.in'),
+     output: 'org.gnome.Calendar.appdata.xml.in',
diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb
index a28913bfa..4b62a0c07 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb
@@ -22,6 +22,7 @@  inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
+SRC_URI += " file://0001-meson.build-fix-meson-0.61-builds.patch"
 SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a"
 
 FILES:${PN} += " \

[12/19] gnome-calendar: fix meson 0.61 builds

Commit Message

Patch