!10 fix build when Meson >= 0.61.5

From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2022-06-23 05:12:57 +00:00 committed by Gitee
commit e5d425d7ef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 12 deletions

View File

@ -1,13 +1,13 @@
Name: d-feet
Version: 0.3.16
Release: 4
Summary: A powerful D-Bus Debugger
Name: d-feet
Version: 0.3.16
Release: 5
Summary: A powerful D-Bus Debugger
License: GPLv2+
URL: https://wiki.gnome.org/Apps/DFeet
Source0: https://download.gnome.org/sources/d-feet/0.3/d-feet-%{version}.tar.xz
Patch0: fix-i18n-merge-file.patch
License: GPLv2+
URL: https://wiki.gnome.org/Apps/DFeet
Source0: https://download.gnome.org/sources/d-feet/0.3/d-feet-%{version}.tar.xz
BuildArch: noarch
BuildArch: noarch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@ -30,6 +30,7 @@ D-Bus objects of running programs and invoke methods on those objects.
%prep
%setup -q
%patch -p1
%build
%meson
@ -57,15 +58,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.dfeet.deskt
%{_datadir}/metainfo/org.gnome.dfeet.appdata.xml
%changelog
* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.3.16-5
- fix build when Meson >= 0.61.5
- fix-i18n-merge-file.patch
* Tue Mar 01 2022 tanyulong <tanyulong@kylinos.cn> - 0.3.16-4
- Rebuilt
* Mon Feb 21 2021 peijiankang <peijiankang@kylinos.cn> - 0.3.16-3
* Mon Feb 21 2022 peijiankang <peijiankang@kylinos.cn> - 0.3.16-3
- rebuilt
* Mon Feb 21 2021 peijiankang <peijiankang@kylinos.cn> - 0.3.16-2
* Mon Feb 21 2022 peijiankang <peijiankang@kylinos.cn> - 0.3.16-2
- add libxml2 libstdc++ libgcc Requires
* Wed Nov 09 2021 tanyulong <tanyulong@kylinos.cn> - 0.3.16-1
* Tue Nov 09 2021 tanyulong <tanyulong@kylinos.cn> - 0.3.16-1
- init package for OpenEuler

19
fix-i18n-merge-file.patch Normal file
View File

@ -0,0 +1,19 @@
diff -up d-feet-0.3.16/data/meson.build.orig d-feet-0.3.16/data/meson.build
--- d-feet-0.3.16/data/meson.build.orig 2022-06-23 04:31:45.288000000 +0000
+++ d-feet-0.3.16/data/meson.build 2022-06-23 04:32:02.076000000 +0000
@@ -13,7 +13,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: '@BASENAME@',
@@ -25,7 +24,6 @@ i18n.merge_file(
appdata = df_namespace + '.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
output: '@BASENAME@',
po_dir: po_dir,