diff options
3 files changed, 21 insertions, 48 deletions
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 @@ | |||
| 1 | From 86379a220a4eb00c309f514d2ca57ed6c1c8b35c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Fri, 21 Jan 2022 22:22:58 +0100 | ||
| 4 | Subject: [PATCH] editor/meson.build: fix meson 0.61 errors | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21] | ||
| 7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 8 | --- | ||
| 9 | editor/meson.build | 2 -- | ||
| 10 | 1 file changed, 2 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/editor/meson.build b/editor/meson.build | ||
| 13 | index 4c89ab99..0eb3bb1a 100644 | ||
| 14 | --- a/editor/meson.build | ||
| 15 | +++ b/editor/meson.build | ||
| 16 | @@ -1,7 +1,6 @@ | ||
| 17 | desktop = dconf_editor_namespace + '.desktop' | ||
| 18 | |||
| 19 | i18n.merge_file ( | ||
| 20 | - desktop, | ||
| 21 | type: 'desktop', | ||
| 22 | input: desktop + '.in', | ||
| 23 | output: desktop, | ||
| 24 | @@ -26,7 +25,6 @@ configure_file( | ||
| 25 | appdata = dconf_editor_namespace + '.appdata.xml' | ||
| 26 | |||
| 27 | i18n.merge_file( | ||
| 28 | - appdata, | ||
| 29 | input: appdata + '.in', | ||
| 30 | output: appdata, | ||
| 31 | 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 @@ | |||
| 1 | SUMMARY = "Configuration editor for dconf" | ||
| 2 | LICENSE = "GPL-3.0-only" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | ||
| 4 | |||
| 5 | GNOMEBASEBUILDCLASS = "meson" | ||
| 6 | |||
| 7 | DEPENDS = "dconf gtk+3" | ||
| 8 | |||
| 9 | inherit gnomebase vala gettext gsettings bash-completion | ||
| 10 | |||
| 11 | SRC_URI += " file://0001-editor-meson.build-fix-meson-0.61-errors.patch" | ||
| 12 | SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" | ||
| 13 | |||
| 14 | FILES:${PN} += " \ | ||
| 15 | ${datadir}/dbus-1 \ | ||
| 16 | ${datadir}/metainfo \ | ||
| 17 | " | ||
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 @@ | |||
| 1 | SUMMARY = "Configuration editor for dconf" | ||
| 2 | LICENSE = "GPL-3.0-only" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | ||
| 4 | |||
| 5 | GNOMEBASEBUILDCLASS = "meson" | ||
| 6 | |||
| 7 | DEPENDS = " \ | ||
| 8 | dconf \ | ||
| 9 | gtk+3 \ | ||
| 10 | glib-2.0 \ | ||
| 11 | libhandy\ | ||
| 12 | " | ||
| 13 | |||
| 14 | inherit gnomebase vala gsettings bash-completion pkgconfig gtk-icon-cache | ||
| 15 | |||
| 16 | SRC_URI[archive.sha256sum] = "935a3c2dd76cc2a93cd5aee9a54d3947fb111eb396f4b63dc5f0ba8f8d099136" | ||
| 17 | |||
| 18 | FILES:${PN} += " \ | ||
| 19 | ${datadir}/dbus-1 \ | ||
| 20 | ${datadir}/metainfo \ | ||
| 21 | " | ||
