From 5c93865818b971dcb39ca94b4cb34c5e7608b8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 2 Apr 2022 18:40:32 +0200 Subject: [PATCH] gnome-calendar 41.2 -> 42.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ...01-meson.build-fix-meson-0.61-builds.patch | 23 ------------------- ...alendar_41.2.bb => gnome-calendar_42.0.bb} | 9 ++++---- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch rename meta-gnome/recipes-gnome/gnome-calendar/{gnome-calendar_41.2.bb => gnome-calendar_42.0.bb} (72%) 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 8ec980bb126..00000000000 --- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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_42.0.bb similarity index 72% rename from meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb rename to meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb index c97bf0bec82..7b32be611d2 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" SECTION = "x11/gnome" DEPENDS = " \ - gtk+3 \ + gtk4 \ libical \ gsettings-desktop-schemas \ evolution-data-server \ libsoup-2.4 \ libdazzle \ - libhandy \ - libgweather \ + libadwaita \ + libgweather4 \ geoclue \ " @@ -22,8 +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" +SRC_URI[archive.sha256sum] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa" FILES:${PN} += " \ ${datadir}/gnome-shell \