diff options
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch | 38 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1_4.14.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch new file mode 100644 index 0000000000..bfc9b9fca7 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/fix-gtkdoc.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Backport [https://gitlab.com/gnutls/libtasn1/merge_requests/49] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ebd4f871b5241809f6a5b461444a6d331e15c949 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Mon, 9 Sep 2019 13:11:39 +0100 | ||
7 | Subject: [PATCH] doc/reference: don't add empty object hierarchy chapter | ||
8 | |||
9 | The object hierarchy section is empty because there are no GObjects in the | ||
10 | libtasn1 API. With gtk-doc 1.30 onwards if there are no objects then the object | ||
11 | hierarchy file won't exist, resulting in a failure when building the | ||
12 | documentation: | ||
13 | |||
14 | | ../libtasn1-docs.xml:39: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found | ||
15 | |||
16 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
17 | --- | ||
18 | doc/reference/libtasn1-docs.xml | 4 ---- | ||
19 | 1 file changed, 4 deletions(-) | ||
20 | |||
21 | diff --git a/doc/reference/libtasn1-docs.xml b/doc/reference/libtasn1-docs.xml | ||
22 | index accdb85..f88b888 100644 | ||
23 | --- a/doc/reference/libtasn1-docs.xml | ||
24 | +++ b/doc/reference/libtasn1-docs.xml | ||
25 | @@ -34,10 +34,6 @@ | ||
26 | <xi:include href="xml/libtasn1.xml"/> | ||
27 | |||
28 | </chapter> | ||
29 | - <chapter id="object-tree"> | ||
30 | - <title>Object Hierarchy</title> | ||
31 | - <xi:include href="xml/tree_index.sgml"/> | ||
32 | - </chapter> | ||
33 | <index id="api-index-full"> | ||
34 | <title>API Index</title> | ||
35 | <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
diff --git a/meta/recipes-support/gnutls/libtasn1_4.14.bb b/meta/recipes-support/gnutls/libtasn1_4.14.bb index 7158e483e9..ef2c1956a2 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.14.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.14.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ | 11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ |
12 | file://dont-depend-on-help2man.patch \ | 12 | file://dont-depend-on-help2man.patch \ |
13 | file://fix-ldflags.patch \ | 13 | file://fix-ldflags.patch \ |
14 | file://fix-gtkdoc.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | DEPENDS = "bison-native" | 17 | DEPENDS = "bison-native" |