From 626bc4cdb1a4f01627e53e04410c7356c55677728ab9267dd53821d24d049ed4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 9 Feb 2022 09:03:32 +0000 Subject: [PATCH] Accepting request 952781 from home:iznogood:branches:GNOME:Factory Fix build with meson 0.61 OBS-URL: https://build.opensuse.org/request/show/952781 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-maps?expand=0&rev=152 --- def20cbb26e59e5023fe157e691de48d7afe7210.patch | 18 ++++++++++++++++++ gnome-maps.changes | 6 ++++++ gnome-maps.spec | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 def20cbb26e59e5023fe157e691de48d7afe7210.patch diff --git a/def20cbb26e59e5023fe157e691de48d7afe7210.patch b/def20cbb26e59e5023fe157e691de48d7afe7210.patch new file mode 100644 index 0000000..3347725 --- /dev/null +++ b/def20cbb26e59e5023fe157e691de48d7afe7210.patch @@ -0,0 +1,18 @@ +diff -Nur orig-gnome-maps-41.2/data/meson.build gnome-maps-41.2/data/meson.build +--- orig-gnome-maps-41.2/data/meson.build 2022-02-08 18:52:33.109927983 +0100 ++++ gnome-maps-41.2/data/meson.build 2022-02-08 18:53:13.382375495 +0100 +@@ -33,7 +33,6 @@ + appdata = app_id + '.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -77,4 +76,4 @@ + ) + endif + +-subdir('icons') +\ Intet linjeskift i slutten av fila ++subdir('icons') diff --git a/gnome-maps.changes b/gnome-maps.changes index 2f03d05..a6d60bb 100644 --- a/gnome-maps.changes +++ b/gnome-maps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 8 17:49:41 UTC 2022 - Bjørn Lie + +- Add def20cbb26e59e5023fe157e691de48d7afe7210.patch: Fix build + with meson 0.61 and newer. Backported to apply on stable version. + ------------------------------------------------------------------- Sun Dec 5 11:57:09 UTC 2021 - Bjørn Lie diff --git a/gnome-maps.spec b/gnome-maps.spec index d8a1072..896648e 100644 --- a/gnome-maps.spec +++ b/gnome-maps.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-maps # -# 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-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/Maps Source0: https://download.gnome.org/sources/gnome-maps/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM def20cbb26e59e5023fe157e691de48d7afe7210.patch -- Fix build with meson 0.61 and newer +Patch0: def20cbb26e59e5023fe157e691de48d7afe7210.patch # Needed for typelib() Requires BuildRequires: gobject-introspection