summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2022-04-03 19:36:03 +0200
committerKhem Raj <raj.khem@gmail.com>2022-04-06 20:25:33 -0400
commitc495d52501ec765e059ece5e69fd116e1ec1d071 (patch)
tree2f29590b57f098a854acb434abe0ef23a40a7bda
parent8a90160e07bf040a7862f3788884d24ba4cb1d72 (diff)
downloadmeta-openembedded-c495d52501ec765e059ece5e69fd116e1ec1d071.tar.gz
gnome-calendar 41.2 -> 42.0
Meson patch was applied Major changes in 42.0: * Updated translations Major changes in 42.rc: * Fix a couple of regressions in the event importer dialog * More timezone fixes when importing events (Milan Crha) * Fix event times in event popover (Björn Daase) * Updated translations Major changes in 41.beta: * Port to GTK4 * Rewrite the Year view to be a month nagivator * Various improvements to timezone handling * Update Ctrl+1/2/3 shortcuts to use Alt instead Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-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_42.0.bb (renamed from meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb)9
2 files changed, 4 insertions, 28 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
deleted file mode 100644
index 8ec980bb12..0000000000
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch
+++ /dev/null
@@ -1,23 +0,0 @@
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_42.0.bb
index c97bf0bec8..7b32be611d 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb
@@ -5,14 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
5SECTION = "x11/gnome" 5SECTION = "x11/gnome"
6 6
7DEPENDS = " \ 7DEPENDS = " \
8 gtk+3 \ 8 gtk4 \
9 libical \ 9 libical \
10 gsettings-desktop-schemas \ 10 gsettings-desktop-schemas \
11 evolution-data-server \ 11 evolution-data-server \
12 libsoup-2.4 \ 12 libsoup-2.4 \
13 libdazzle \ 13 libdazzle \
14 libhandy \ 14 libadwaita \
15 libgweather \ 15 libgweather4 \
16 geoclue \ 16 geoclue \
17" 17"
18 18
@@ -22,8 +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] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa"
26SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a"
27 26
28FILES:${PN} += " \ 27FILES:${PN} += " \
29 ${datadir}/gnome-shell \ 28 ${datadir}/gnome-shell \