diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-20 17:32:15 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-22 22:48:26 +0100 |
commit | 1bab9aa31e1d29591352bad52032ff6fdadf331f (patch) | |
tree | daa14cf1f5695a7915f8f6ec5f38b0a6d14e010b /meta/recipes-gnome/gtk-doc/files | |
parent | 4e4ebda4794c2915beb898caac004a9aef1c6bb1 (diff) | |
download | poky-1bab9aa31e1d29591352bad52032ff6fdadf331f.tar.gz |
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>
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files')
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch | 23 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch b/meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch deleted file mode 100644 index bb8f55c41d..0000000000 --- a/meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 63bc4cd1ce2d918c6566a4e0c7d830713432fc82 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 28 Jun 2019 13:08:24 +0200 | ||
4 | Subject: [PATCH] highlight.py: correctly set permissions on file to be written | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/GNOME/gtk-doc/commit/12d9a698fb58f3d1a840d3bfc0d15a3a9f57afc1] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | gtkdoc/highlight.py | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py | ||
13 | index 8f6e470..82e11e8 100644 | ||
14 | --- a/gtkdoc/highlight.py | ||
15 | +++ b/gtkdoc/highlight.py | ||
16 | @@ -47,6 +47,6 @@ def highlight_code(code, lang='c'): | ||
17 | |||
18 | |||
19 | def append_style_defs(css_file_name): | ||
20 | - os.chmod(css_file_name, stat.S_IWRITE) | ||
21 | + os.chmod(css_file_name, 0o644) | ||
22 | with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css: | ||
23 | css.write(HTML_FORMATTER.get_style_defs()) | ||
diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index 5674a38abd..8c9bc95442 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 31254fac614bb6ee28cf6fdd514a9563a5d781a8 Mon Sep 17 00:00:00 2001 | 1 | From 9537a7998a220b698b26d926a111bb400ff1ce01 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 | 3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 |
4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. | 4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. |