diff --git a/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch b/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch new file mode 100644 index 0000000..816184c --- /dev/null +++ b/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch @@ -0,0 +1,11 @@ +diff -Nur orig-gvfs-1.48.1/daemon/meson.build gvfs-1.48.1/daemon/meson.build +--- orig-gvfs-1.48.1/daemon/meson.build 2022-02-08 18:43:00.707587580 +0100 ++++ gvfs-1.48.1/daemon/meson.build 2022-02-08 18:44:15.400411932 +0100 +@@ -366,7 +366,6 @@ + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, diff --git a/gvfs.changes b/gvfs.changes index d5abc27..2ebe86e 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 8 17:40:08 UTC 2022 - Bjørn Lie + +- Add 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch: Fix build + with meson 0.61 and newer. Backported to apply on stable version. + ------------------------------------------------------------------- Sat Jan 15 20:57:06 UTC 2022 - Bjørn Lie diff --git a/gvfs.spec b/gvfs.spec index 3398a8c..3ef8634 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -27,6 +27,9 @@ URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.48/%{name}-%{version}.tar.xz Source99: baselibs.conf +# PATCH-FIX-UPSTREAM 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch -- Fix build with meson 0.61 and newer +Patch0: 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch + ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus Patch1000: gvfs-nds.patch @@ -158,7 +161,7 @@ gvfs plugins. %prep %setup -q - +%patch0 -p1 %if 0%{?sle_version} %patch1000 -p1 %patch1001 -p1