diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch | 31 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb | 1 |
2 files changed, 32 insertions, 0 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 new file mode 100644 index 0000000000..850d8a9d47 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 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 index 97e994c1fa..55b29139bb 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb | |||
| @@ -8,6 +8,7 @@ DEPENDS = "dconf gtk+3" | |||
| 8 | 8 | ||
| 9 | inherit gnomebase vala gettext gsettings bash-completion | 9 | inherit gnomebase vala gettext gsettings bash-completion |
| 10 | 10 | ||
| 11 | SRC_URI += " file://0001-editor-meson.build-fix-meson-0.61-errors.patch" | ||
| 11 | SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" | 12 | SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" |
| 12 | 13 | ||
| 13 | FILES:${PN} += " \ | 14 | FILES:${PN} += " \ |
