diff options
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.patch | 30 | ||||
-rw-r--r-- | meta/recipes-gnome/json-glib/json-glib_1.8.0.bb (renamed from meta/recipes-gnome/json-glib/json-glib_1.6.0.bb) | 19 |
2 files changed, 8 insertions, 41 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 @@ | |||
1 | From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 30 Oct 2020 22:15:29 +0000 | ||
4 | Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility | ||
5 | |||
6 | Changes the comment and include to reference the file basename | ||
7 | instead of the full path. This ensures that the generated file is | ||
8 | reproducible when it is included in source packages meant for debugging. | ||
9 | |||
10 | Upstream-Status: Backport [6f3842abd5dff68b6ee5f2ef48a4ebf1cbebf434] | ||
11 | Signed-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 | |||
16 | diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in | ||
17 | index 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.8.0.bb index 59b0609900..2094ebe3e7 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.8.0.bb | |||
@@ -6,22 +6,19 @@ instances to and from JSON data types." | |||
6 | HOMEPAGE = "https://wiki.gnome.org/Projects/JsonGlib" | 6 | HOMEPAGE = "https://wiki.gnome.org/Projects/JsonGlib" |
7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/json-glib/issues" | 7 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/json-glib/issues" |
8 | 8 | ||
9 | LICENSE = "LGPLv2.1" | 9 | LICENSE = "LGPL-2.1-only" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" |
11 | 11 | ||
12 | DEPENDS = "glib-2.0" | 12 | DEPENDS = "glib-2.0 glib-2.0-native" |
13 | 13 | ||
14 | GNOMEBASEBUILDCLASS = "meson" | 14 | inherit gnomebase lib_package gobject-introspection gi-docgen gettext ptest-gnome manpages upstream-version-is-even |
15 | inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even | ||
16 | GIR_MESON_ENABLE_FLAG = 'enabled' | 15 | GIR_MESON_ENABLE_FLAG = 'enabled' |
17 | GIR_MESON_DISABLE_FLAG = 'disabled' | 16 | GIR_MESON_DISABLE_FLAG = 'disabled' |
18 | GTKDOC_MESON_OPTION = "gtk_doc" | 17 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' |
19 | GTKDOC_MESON_ENABLE_FLAG = 'enabled' | 18 | GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' |
20 | GTKDOC_MESON_DISABLE_FLAG = 'disabled' | ||
21 | 19 | ||
22 | SRC_URI += "file://run-ptest \ | 20 | SRC_URI += " file://run-ptest" |
23 | file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" | 21 | SRC_URI[archive.sha256sum] = "97ef5eb92ca811039ad50a65f06633f1aae64792789307be7170795d8b319454" |
24 | SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" | ||
25 | 22 | ||
26 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 23 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
27 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" | 24 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" |
@@ -31,4 +28,4 @@ BBCLASSEXTEND = "native nativesdk" | |||
31 | 28 | ||
32 | # Currently it's not possible to disable gettext in Meson, so we need to force | 29 | # Currently it's not possible to disable gettext in Meson, so we need to force |
33 | # this back on. | 30 | # this back on. |
34 | USE_NLS_class-native = "yes" | 31 | USE_NLS:class-native = "yes" |