From 5a09d164b004e3e2c5d2990f817daf4cfbbec7db Mon Sep 17 00:00:00 2001 From: zhang__3125 <13466585422@163.com> Date: Wed, 22 Jun 2022 18:14:22 +0800 Subject: [PATCH] fix build when Meson >= 0.61.5 --- fix-i18n-merge-file.patch | 11 +++++++++++ gnome-user-share.spec | 20 ++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 fix-i18n-merge-file.patch diff --git a/fix-i18n-merge-file.patch b/fix-i18n-merge-file.patch new file mode 100644 index 0000000..a8c7691 --- /dev/null +++ b/fix-i18n-merge-file.patch @@ -0,0 +1,11 @@ +diff -up gnome-user-share-3.34.0/data/meson.build.orig gnome-user-share-3.34.0/data/meson.build +--- gnome-user-share-3.34.0/data/meson.build.orig 2022-06-22 10:06:57.184000000 +0000 ++++ gnome-user-share-3.34.0/data/meson.build 2022-06-22 10:07:16.824000000 +0000 +@@ -7,7 +7,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: '@BASENAME@', diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 25a496f..b1809a1 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -1,11 +1,11 @@ -Name: gnome-user-share -Version: 3.34.0 -Release: 2 -Summary: Gnome user file sharing - -License: GPLv2+ -URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-user-share/3.34/%{name}-%{version}.tar.xz +Name: gnome-user-share +Version: 3.34.0 +Release: 3 +Summary: Gnome user file sharing +License: GPLv2+ +URL: http://www.gnome.org +Source0: http://download.gnome.org/sources/gnome-user-share/3.34/%{name}-%{version}.tar.xz +Patch0: fix-i18n-merge-file.patch BuildRequires: gcc gtk3-devel httpd itstool libcanberra-devel meson desktop-file-utils BuildRequires: libselinux-devel dbus-glib-devel libnotify-devel nautilus-devel gettext @@ -54,6 +54,10 @@ up in the Network location in GNOME. %{_userunitdir}/gnome-user-share-webdav.service %changelog +* Mon Jun 20 2022 lin zhang - 3.34.0-3 +- fix build when Meson >= 0.61.5 +- add patch fix-i18n-merge-file.patch + * Mon Apr 18 2022 lin zhang - 3.34.0-2 - Add gnome-user-share.yaml