diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:05:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:38 +0100 |
commit | b66f69b0a4c7dc41d8ce8d1fd939fa11c6508e2f (patch) | |
tree | 8ea95e69ca8d01af7d13755f1ac12ef9b11e4041 /meta/recipes-gnome/libhandy | |
parent | bfac9978003212768b8951864235d5fb07b45021 (diff) | |
download | poky-b66f69b0a4c7dc41d8ce8d1fd939fa11c6508e2f.tar.gz |
libhandy: update 1.5.0 -> 1.6.2
Doc generation has been migrated to gi-docgen from gtk-doc.
(From OE-Core rev: b6b3ff25ee3bf22d9b3d873924afb53d3fb59ddc)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/libhandy')
-rw-r--r-- | meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch | 37 | ||||
-rw-r--r-- | meta/recipes-gnome/libhandy/libhandy_1.6.2.bb (renamed from meta/recipes-gnome/libhandy/libhandy_1.5.0.bb) | 9 |
2 files changed, 3 insertions, 43 deletions
diff --git a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch b/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch deleted file mode 100644 index 7b2a512738..0000000000 --- a/meta/recipes-gnome/libhandy/libhandy/0001-Add-private-headers.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 8 Dec 2021 07:35:52 +0000 | ||
4 | Subject: [PATCH] Add private headers | ||
5 | |||
6 | After the commit(8157ecc Separate public and private enums) introduced, | ||
7 | there comes a race as below: | ||
8 | | In file included from ../git/src/hdy-settings.c:11: | ||
9 | | ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory | ||
10 | | 16 | #include "hdy-enums-private.h" | ||
11 | |||
12 | So also add private headers like private sources to libhandy_sources to | ||
13 | fix the issue. | ||
14 | |||
15 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796] | ||
16 | |||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
18 | --- | ||
19 | src/meson.build | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/meson.build b/src/meson.build | ||
23 | index d087323..6f11f27 100644 | ||
24 | --- a/src/meson.build | ||
25 | +++ b/src/meson.build | ||
26 | @@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private', | ||
27 | ) | ||
28 | |||
29 | libhandy_public_sources += [hdy_public_enums[0]] | ||
30 | -libhandy_private_sources += [hdy_private_enums[0]] | ||
31 | +libhandy_private_sources += hdy_private_enums | ||
32 | libhandy_generated_headers += [hdy_public_enums[1]] | ||
33 | |||
34 | src_headers = [ | ||
35 | -- | ||
36 | 2.32.0 | ||
37 | |||
diff --git a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/meta/recipes-gnome/libhandy/libhandy_1.6.2.bb index 722593dfb1..8d9904637f 100644 --- a/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb +++ b/meta/recipes-gnome/libhandy/libhandy_1.6.2.bb | |||
@@ -9,18 +9,15 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" | |||
9 | LICENSE = "LGPL-2.1-only" | 9 | LICENSE = "LGPL-2.1-only" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
11 | 11 | ||
12 | SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6" |
13 | file://0001-Add-private-headers.patch \ | 13 | SRCREV = "f050453109db05621b9a47b9931fe1b571905e67" |
14 | " | ||
15 | SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" | ||
16 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
17 | 15 | ||
18 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))" |
19 | GIR_MESON_ENABLE_FLAG = 'enabled' | 17 | GIR_MESON_ENABLE_FLAG = 'enabled' |
20 | GIR_MESON_DISABLE_FLAG = 'disabled' | 18 | GIR_MESON_DISABLE_FLAG = 'disabled' |
21 | GTKDOC_MESON_OPTION = 'gtk_doc' | ||
22 | 19 | ||
23 | inherit meson gobject-introspection vala gettext gtk-doc features_check | 20 | inherit meson gobject-introspection vala gettext gi-docgen features_check pkgconfig |
24 | 21 | ||
25 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 22 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
26 | 23 | ||