summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch23
-rw-r--r--meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb1
2 files changed, 24 insertions, 0 deletions
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 0000000000..8ec980bb12
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch
@@ -0,0 +1,23 @@
1From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Fri, 21 Jan 2022 21:18:39 +0100
4Subject: [PATCH] meson.build: fix meson 0.61 builds
5
6Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 data/appdata/meson.build | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/data/appdata/meson.build b/data/appdata/meson.build
13index b5ee6540..200c3507 100644
14--- a/data/appdata/meson.build
15+++ b/data/appdata/meson.build
16@@ -1,7 +1,6 @@
17 appdata_conf = configuration_data()
18 appdata_conf.set('appid', application_id)
19 appdata = i18n.merge_file(
20- 'appdata',
21 input: configure_file(
22 input: files('org.gnome.Calendar.appdata.xml.in.in'),
23 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 a28913bfa4..4b62a0c07c 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
22 22
23REQUIRED_DISTRO_FEATURES = "x11" 23REQUIRED_DISTRO_FEATURES = "x11"
24 24
25SRC_URI += " file://0001-meson.build-fix-meson-0.61-builds.patch"
25SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a" 26SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a"
26 27
27FILES:${PN} += " \ 28FILES:${PN} += " \