summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/json-glib
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-02-18 12:24:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-19 11:17:11 +0000
commitcaa43d0173a5e2c46d85a53d31c96ca65b326231 (patch)
treee32f5315a24d6f5601736bea14badf80aa89dc8b /meta/recipes-gnome/json-glib
parent3ad8461f6a16ae490e32faa9b1f84eeee49b3590 (diff)
downloadpoky-caa43d0173a5e2c46d85a53d31c96ca65b326231.tar.gz
json-glib: upgrade 1.6.0 -> 1.6.2
(From OE-Core rev: eae6582575c5b1853b247820c0e354191fb44d4e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/json-glib')
-rw-r--r--meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch30
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_1.6.2.bb (renamed from meta/recipes-gnome/json-glib/json-glib_1.6.0.bb)5
2 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch
deleted file mode 100644
index 0eb7244186..0000000000
--- a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Oct 2020 22:15:29 +0000
4Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility
5
6Changes the comment and include to reference the file basename
7instead of the full path. This ensures that the generated file is
8reproducible when it is included in source packages meant for debugging.
9
10Upstream-Status: Backport [6f3842abd5dff68b6ee5f2ef48a4ebf1cbebf434]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 json-glib/json-enum-types.c.in | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in
17index da07c46..7b39290 100644
18--- a/json-glib/json-enum-types.c.in
19+++ b/json-glib/json-enum-types.c.in
20@@ -9,8 +9,8 @@
21
22 /*** BEGIN file-production ***/
23
24-/* enumerations from "@filename@" */
25-#include "@filename@"
26+/* enumerations from "@basename@" */
27+#include "@basename@"
28
29 /*** END file-production ***/
30
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb
index 59b0609900..fdf3b245e8 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb
@@ -19,9 +19,8 @@ GTKDOC_MESON_OPTION = "gtk_doc"
19GTKDOC_MESON_ENABLE_FLAG = 'enabled' 19GTKDOC_MESON_ENABLE_FLAG = 'enabled'
20GTKDOC_MESON_DISABLE_FLAG = 'disabled' 20GTKDOC_MESON_DISABLE_FLAG = 'disabled'
21 21
22SRC_URI += "file://run-ptest \ 22SRC_URI += " file://run-ptest"
23 file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" 23SRC_URI[archive.sha256sum] = "a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24"
24SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73"
25 24
26PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" 25PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
27PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" 26PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native"