mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
bfac997800
commit
b66f69b0a4
@@ -1,37 +0,0 @@
|
||||
From e7c3e8fa00f6a68b2e0629db5ee115e641ea710e Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Wed, 8 Dec 2021 07:35:52 +0000
|
||||
Subject: [PATCH] Add private headers
|
||||
|
||||
After the commit(8157ecc Separate public and private enums) introduced,
|
||||
there comes a race as below:
|
||||
| In file included from ../git/src/hdy-settings.c:11:
|
||||
| ../git/src/hdy-settings-private.h:16:10: fatal error: hdy-enums-private.h: No such file or directory
|
||||
| 16 | #include "hdy-enums-private.h"
|
||||
|
||||
So also add private headers like private sources to libhandy_sources to
|
||||
fix the issue.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/796]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
src/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index d087323..6f11f27 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -64,7 +64,7 @@ hdy_private_enums = gnome.mkenums('hdy-enums-private',
|
||||
)
|
||||
|
||||
libhandy_public_sources += [hdy_public_enums[0]]
|
||||
-libhandy_private_sources += [hdy_private_enums[0]]
|
||||
+libhandy_private_sources += hdy_private_enums
|
||||
libhandy_generated_headers += [hdy_public_enums[1]]
|
||||
|
||||
src_headers = [
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -9,18 +9,15 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues"
|
||||
LICENSE = "LGPL-2.1-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \
|
||||
file://0001-Add-private-headers.patch \
|
||||
"
|
||||
SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab"
|
||||
SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6"
|
||||
SRCREV = "f050453109db05621b9a47b9931fe1b571905e67"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))"
|
||||
GIR_MESON_ENABLE_FLAG = 'enabled'
|
||||
GIR_MESON_DISABLE_FLAG = 'disabled'
|
||||
GTKDOC_MESON_OPTION = 'gtk_doc'
|
||||
|
||||
inherit meson gobject-introspection vala gettext gtk-doc features_check
|
||||
inherit meson gobject-introspection vala gettext gi-docgen features_check pkgconfig
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
Reference in New Issue
Block a user