From 2a71ebbe5bc57bae0d85b42bb0467ffb8ef7d286 Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Mon, 20 Jun 2022 14:56:17 +0800
Subject: [PATCH] fix meson 0.61 errors

---
 dconf-editor.spec           |  7 ++++++-
 fix-meson-0.61-errors.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 fix-meson-0.61-errors.patch

diff --git a/dconf-editor.spec b/dconf-editor.spec
index 50910d3..6b079d5 100644
--- a/dconf-editor.spec
+++ b/dconf-editor.spec
@@ -4,12 +4,14 @@
 
 Name:           dconf-editor
 Version:        3.38.3
-Release:        1
+Release:        2
 Summary:        Graphical editor for dconf
 
 License:        GPLv3
 URL:            https://wiki.gnome.org/Projects/dconf
 Source0:        https://download.gnome.org/sources/dconf-editor/3.38/dconf-editor-%{version}.tar.xz
+#refer: https://github.com/GNOME/dconf-editor/commit/d67ce9bee411658082700a22f4692c8c9a790ea6
+Patch0000:      fix-meson-0.61-errors.patch
 
 BuildRequires:  /usr/bin/appstream-util desktop-file-utils gettext meson vala
 BuildRequires:  pkgconfig(dconf) >= %{dconf_version} pkgconfig(glib-2.0) >= %{glib2_version}
@@ -56,6 +58,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/ca.desrt.dconf-editor
 %{_mandir}/man1/dconf-editor.1*
 
 %changelog
+* Mon Jun 20 2022 caodongxia <caodongxia@h-partners.com> - 3.38.3-2
+- Fix the build failure caused by meson 0.61
+
 * Wed Jun 30 2021 caodongxia <caodongxia@huawei.com> - 3.38.3-1
 - Package upgrade to 3.38.3
 
diff --git a/fix-meson-0.61-errors.patch b/fix-meson-0.61-errors.patch
new file mode 100644
index 0000000..327e531
--- /dev/null
+++ b/fix-meson-0.61-errors.patch
@@ -0,0 +1,31 @@
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+   
\ No newline at end of file