From 032a43a929642685ef38f06fe55f3057738cfc946e25b63c16553745b999fd52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 3 Feb 2022 21:50:21 +0000 Subject: [PATCH] Accepting request 950551 from GNOME:Next Mesonfix OBS-URL: https://build.opensuse.org/request/show/950551 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-calendar?expand=0&rev=100 --- ...bc1acd03dd1751b755b6c8e1932a692ad4e1.patch | 25 +++++++++++++++++++ gnome-calendar.changes | 6 +++++ gnome-calendar.spec | 4 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch diff --git a/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch b/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch new file mode 100644 index 0000000..78e1cb1 --- /dev/null +++ b/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch @@ -0,0 +1,25 @@ +From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 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 + +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', +-- +GitLab + diff --git a/gnome-calendar.changes b/gnome-calendar.changes index 86818c2..cc6491e 100644 --- a/gnome-calendar.changes +++ b/gnome-calendar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 1 20:51:58 UTC 2022 - Bjørn Lie + +- Add e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch: Fix build + with meson 0.61.0 and newer. + ------------------------------------------------------------------- Fri Dec 10 21:29:43 UTC 2021 - Bjørn Lie diff --git a/gnome-calendar.spec b/gnome-calendar.spec index b2df572..14404b2 100644 --- a/gnome-calendar.spec +++ b/gnome-calendar.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-calendar # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: GPL-3.0-or-later Group: Productivity/Office/Organizers URL: https://wiki.gnome.org/Design/Apps/Calendar Source0: https://download.gnome.org/sources/gnome-calendar/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch -- Fix build with meson 0.61.0 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/e35dbc1acd03dd1751b755b6c8e1932a692ad4e1.patch BuildRequires: fdupes BuildRequires: meson