diff --git a/4be71525f07189e97720688472172604879d49a5.patch b/4be71525f07189e97720688472172604879d49a5.patch new file mode 100644 index 0000000..9b2f4a4 --- /dev/null +++ b/4be71525f07189e97720688472172604879d49a5.patch @@ -0,0 +1,26 @@ +From 4be71525f07189e97720688472172604879d49a5 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Fri, 17 Dec 2021 12:26:42 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for a time and +explicitly rejects with error since meson 0.60.0 +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index f6692b6..6981b96 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -59,7 +59,6 @@ endif + appdata_conf = configuration_data() + appdata_conf.set('app_id', weather_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: '@0@.appdata.xml.in.in'.format(default_id), + output: '@0@.appdata.xml.in'.format(default_id), +-- +GitLab + diff --git a/gnome-weather.changes b/gnome-weather.changes index 433b232..4bd6699 100644 --- a/gnome-weather.changes +++ b/gnome-weather.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 2 17:17:49 UTC 2022 - Bjørn Lie + +- Add 4be71525f07189e97720688472172604879d49a5.patch: Fix build + with meson 0.61 and newer. +- Drop update-desktop-files BuildRequires and macro, no longer + needed. +- Add appstream-glib and desktop-file-utils BuildRequires, verify + desktop file and metainfo during meson_test macro run. + ------------------------------------------------------------------- Tue Sep 21 14:04:52 UTC 2021 - Bjørn Lie diff --git a/gnome-weather.spec b/gnome-weather.spec index 03ef0cb..7fc7f4d 100644 --- a/gnome-weather.spec +++ b/gnome-weather.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-weather # -# 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 @@ -25,11 +25,14 @@ License: GPL-2.0-or-later Group: Productivity/Other URL: https://live.gnome.org/Design/Apps/Weather Source0: https://download.gnome.org/sources/gnome-weather/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 4be71525f07189e97720688472172604879d49a5.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-weather/-/commit/4be71525f07189e97720688472172604879d49a5.patch +BuildRequires: appstream-glib +BuildRequires: desktop-file-utils BuildRequires: intltool >= 0.26 BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -73,7 +76,6 @@ search results from GNOME Weather. %install %meson_install -%suse_update_desktop_file %{_name} Utility DesktopUtility %find_lang %{_name} %{?no_lang_C} %{name}.lang %check