diff --git a/7c9935a02b48f332f67bad3e4ee020b75591084a.patch b/7c9935a02b48f332f67bad3e4ee020b75591084a.patch new file mode 100644 index 0000000..7c54948 --- /dev/null +++ b/7c9935a02b48f332f67bad3e4ee020b75591084a.patch @@ -0,0 +1,38 @@ +From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:44:06 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:5:0: ERROR: Function does not take positional arguments. +data/meson.build:24:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f18f247..9c95e02 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') + + resources = gnome.compile_resources('gnome-sudoku', resource_files) + +-desktop_file = i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), + install: true, +@@ -21,7 +21,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + install: true, +-- +GitLab + diff --git a/gnome-sudoku.changes b/gnome-sudoku.changes index a58dc36..cdab264 100644 --- a/gnome-sudoku.changes +++ b/gnome-sudoku.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 2 12:24:39 UTC 2022 - Bjørn Lie + +- Add 7c9935a02b48f332f67bad3e4ee020b75591084a.patch: Fix build + with meson 0.60.0 and newer. + ------------------------------------------------------------------- Sat Jul 24 16:16:13 UTC 2021 - Bjørn Lie diff --git a/gnome-sudoku.spec b/gnome-sudoku.spec index a1aac3f..dc2080e 100644 --- a/gnome-sudoku.spec +++ b/gnome-sudoku.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-sudoku # -# 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: Amusements/Games/Logic URL: https://wiki.gnome.org/Apps/Sudoku Source0: https://download.gnome.org/sources/gnome-sudoku/40/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 7c9935a02b48f332f67bad3e4ee020b75591084a.patch -- Fix build with meson 0.60.0 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a.patch BuildRequires: fdupes BuildRequires: gcc-c++