diff --git a/57.patch b/57.patch new file mode 100644 index 0000000..b21aa04 --- /dev/null +++ b/57.patch @@ -0,0 +1,36 @@ +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +GitLab + diff --git a/gnome-screenshot.spec b/gnome-screenshot.spec index 1a20be9..bf208f8 100644 --- a/gnome-screenshot.spec +++ b/gnome-screenshot.spec @@ -2,13 +2,17 @@ Name: gnome-screenshot Version: 41.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A screenshot utility for GNOME License: GPLv2+ URL: https://gitlab.gnome.org/GNOME/gnome-screenshot Source0: https://download.gnome.org/sources/gnome-screenshot/41/gnome-screenshot-%{tarball_version}.tar.xz +# Fix the build with meson 0.60 +# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57 +Patch0: 57.patch + BuildRequires: gcc BuildRequires: gettext BuildRequires: libappstream-glib-devel @@ -57,6 +61,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Screenshot. %changelog +* Fri Oct 07 2022 Kalev Lember - 41.0-4 +- Fix the build with meson 0.60 (#2113253) + * Thu Jul 21 2022 Fedora Release Engineering - 41.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild