1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-05 02:20:12 +00:00

gtk-doc: upgrade 1.30 -> 1.31

Drop backported patch.

(From OE-Core rev: bf9cff0177aad35efe58276e1dd65b47872dc6d5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-08-20 17:32:15 +02:00
committed by Richard Purdie
parent 4e4ebda479
commit 1bab9aa31e
3 changed files with 3 additions and 27 deletions
@@ -1,23 +0,0 @@
From 63bc4cd1ce2d918c6566a4e0c7d830713432fc82 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 28 Jun 2019 13:08:24 +0200
Subject: [PATCH] highlight.py: correctly set permissions on file to be written
Upstream-Status: Backport [https://github.com/GNOME/gtk-doc/commit/12d9a698fb58f3d1a840d3bfc0d15a3a9f57afc1]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gtkdoc/highlight.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
index 8f6e470..82e11e8 100644
--- a/gtkdoc/highlight.py
+++ b/gtkdoc/highlight.py
@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
def append_style_defs(css_file_name):
- os.chmod(css_file_name, stat.S_IWRITE)
+ os.chmod(css_file_name, 0o644)
with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
css.write(HTML_FORMATTER.get_style_defs())
@@ -1,4 +1,4 @@
From 31254fac614bb6ee28cf6fdd514a9563a5d781a8 Mon Sep 17 00:00:00 2001
From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 5 Sep 2016 22:25:44 +0100
Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
@@ -18,13 +18,12 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
SRC_URI[archive.md5sum] = "1045ba29ca0693ced2045523407aae4c"
SRC_URI[archive.sha256sum] = "a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e"
SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772"
SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011"
SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
file://conditionaltests.patch \
file://no-clobber.patch \
file://0001-highlight.py-correctly-set-permissions-on-file-to-be.patch \
"
SRC_URI_append_class-native = " file://pkg-config-native.patch"