diff options
-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 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb (renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb) | 5 |
3 files changed, 3 insertions, 27 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. |
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb index fce0329534..4f97ce0633 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb | |||
@@ -18,13 +18,12 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", | |||
18 | PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" | 18 | PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" |
19 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" | 19 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" |
20 | 20 | ||
21 | SRC_URI[archive.md5sum] = "1045ba29ca0693ced2045523407aae4c" | 21 | SRC_URI[archive.md5sum] = "6239713011369a4fbdc7619350403772" |
22 | SRC_URI[archive.sha256sum] = "a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e" | 22 | SRC_URI[archive.sha256sum] = "a51687956d0377ac70904d03fdc73c9e116589b4a01453fa92162442b3657011" |
23 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ | 23 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ |
24 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ | 24 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ |
25 | file://conditionaltests.patch \ | 25 | file://conditionaltests.patch \ |
26 | file://no-clobber.patch \ | 26 | file://no-clobber.patch \ |
27 | file://0001-highlight.py-correctly-set-permissions-on-file-to-be.patch \ | ||
28 | " | 27 | " |
29 | SRC_URI_append_class-native = " file://pkg-config-native.patch" | 28 | SRC_URI_append_class-native = " file://pkg-config-native.patch" |
30 | 29 | ||