From 946516f5312edaa62fd20162d8c7596f77e9ca64 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 28 Jun 2019 15:24:57 +0200 Subject: 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. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...y-correctly-set-permissions-on-file-to-be.patch | 23 ++++++++++++++++++++++ .../gtk-doc/files/pkg-config-native.patch | 2 +- meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch (limited to 'meta/recipes-gnome/gtk-doc') 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 @@ +From 63bc4cd1ce2d918c6566a4e0c7d830713432fc82 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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()) 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 @@ -From a3f69f2ed45efbdaee47c2dde4df3d78323300e5 Mon Sep 17 00:00:00 2001 +From 31254fac614bb6ee28cf6fdd514a9563a5d781a8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 5 Sep 2016 22:25:44 +0100 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.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 \ 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" -- cgit 1.2.3-korg