summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-28 15:24:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-30 22:40:52 +0100
commit538e2f430e4126487adcf9336edee35e2cca4eca (patch)
tree24e47bc2a6e2332bb379b2e23ca69aa234370ced
parentb47cc35280e1d8ad13ea07c16dd4546de1a6aaa5 (diff)
downloadpoky-538e2f430e4126487adcf9336edee35e2cca4eca.tar.gz
gtk-doc: correct the style.css permissions
style.css was set to write-only during build which means it wasn't actually installed or packaged (with only webkitgtk producing a build failure!), which in turn means generated documentation was broken. (From OE-Core rev: 946516f5312edaa62fd20162d8c7596f77e9ca64) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch23
-rw-r--r--meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch2
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb1
3 files changed, 25 insertions, 1 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
new file mode 100644
index 0000000000..bb8f55c41d
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch
@@ -0,0 +1,23 @@
1From 63bc4cd1ce2d918c6566a4e0c7d830713432fc82 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 28 Jun 2019 13:08:24 +0200
4Subject: [PATCH] highlight.py: correctly set permissions on file to be written
5
6Upstream-Status: Backport [https://github.com/GNOME/gtk-doc/commit/12d9a698fb58f3d1a840d3bfc0d15a3a9f57afc1]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 gtkdoc/highlight.py | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
13index 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 3e973a16eb..5674a38abd 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 @@
1From a3f69f2ed45efbdaee47c2dde4df3d78323300e5 Mon Sep 17 00:00:00 2001 1From 31254fac614bb6ee28cf6fdd514a9563a5d781a8 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 5 Sep 2016 22:25:44 +0100 3Date: Mon, 5 Sep 2016 22:25:44 +0100
4Subject: [PATCH] Use native pkg-config when looking for gtk-doc. 4Subject: [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.30.bb
index f16847e40c..fce0329534 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
@@ -24,6 +24,7 @@ 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 \
27 " 28 "
28SRC_URI_append_class-native = " file://pkg-config-native.patch" 29SRC_URI_append_class-native = " file://pkg-config-native.patch"
29 30