From 4a2305a474a9c0342a05085e373a35d439e2d761 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Fri, 30 Dec 2022 14:13:07 +0100
Subject: [PATCH] dconf-editor: update 3.38.3 -> 43.0

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...or-meson.build-fix-meson-0.61-errors.patch | 31 -------------------
 .../dconf/dconf-editor_3.38.3.bb              | 17 ----------
 .../recipes-gnome/dconf/dconf-editor_43.0.bb  | 21 +++++++++++++
 3 files changed, 21 insertions(+), 48 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch
 delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
 create mode 100644 meta-gnome/recipes-gnome/dconf/dconf-editor_43.0.bb

diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch b/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch
deleted file mode 100644
index 850d8a9d47..0000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 86379a220a4eb00c309f514d2ca57ed6c1c8b35c 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
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21]
-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,
diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
deleted file mode 100644
index ef26caa144..0000000000
--- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Configuration editor for dconf"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-GNOMEBASEBUILDCLASS = "meson"
-
-DEPENDS = "dconf gtk+3"
-
-inherit gnomebase vala gettext gsettings bash-completion
-
-SRC_URI += " file://0001-editor-meson.build-fix-meson-0.61-errors.patch"
-SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3"
-
-FILES:${PN} += " \
-    ${datadir}/dbus-1 \
-    ${datadir}/metainfo \
-"
diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_43.0.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_43.0.bb
new file mode 100644
index 0000000000..5b37645604
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_43.0.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Configuration editor for dconf"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+    dconf \
+    gtk+3 \
+    glib-2.0 \
+    libhandy\
+"
+
+inherit gnomebase vala gsettings bash-completion pkgconfig gtk-icon-cache
+
+SRC_URI[archive.sha256sum] = "935a3c2dd76cc2a93cd5aee9a54d3947fb111eb396f4b63dc5f0ba8f8d099136"
+
+FILES:${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/metainfo \
+"