diff --git a/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch new file mode 100644 index 0000000..c989ad4 --- /dev/null +++ b/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch @@ -0,0 +1,33 @@ +From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 +From: rvalue +Date: Wed, 24 Nov 2021 04:52:42 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +Part-of: +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 46df3fd80..eac6b8224 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.Epiphany.desktop.in.in'), + output: 'org.gnome.Epiphany.desktop.in', +@@ -32,7 +31,6 @@ desktop = i18n.merge_file( + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Epiphany.appdata.xml.in.in'), + output: 'org.gnome.Epiphany.appdata.xml.in', +-- +GitLab + diff --git a/epiphany.changes b/epiphany.changes index 7749dc8..1293edf 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 10 18:00:33 UTC 2022 - Bjørn Lie + +- Add bfbb5f7bab38301d8a4a444173acdae8d9692146.patch: Fix build + with meson 0.61 and newer. + ------------------------------------------------------------------- Tue Dec 21 14:25:09 UTC 2021 - Bjørn Lie diff --git a/epiphany.spec b/epiphany.spec index 12ec499..6c283e5 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany # -# 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/Networking/Web/Browsers URL: https://wiki.gnome.org/Apps/Web Source0: https://download.gnome.org/sources/epiphany/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM bfbb5f7bab38301d8a4a444173acdae8d9692146.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch BuildRequires: fdupes BuildRequires: meson >= 0.47.0