From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 08/12] gtk-doc: upgrade 1.30 -> 1.31
Date: Tue, 20 Aug 2019 17:32:15 +0200 [thread overview]
Message-ID: <20190820153219.62435-8-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20190820153219.62435-1-alex.kanavin@gmail.com>
Drop backported patch.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...rectly-set-permissions-on-file-to-be.patch | 23 -------------------
.../gtk-doc/files/pkg-config-native.patch | 2 +-
.../{gtk-doc_1.30.bb => gtk-doc_1.31.bb} | 5 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.30.bb => gtk-doc_1.31.bb} (90%)
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 bb8f55c41d0..00000000000
--- a/meta/recipes-gnome/gtk-doc/files/0001-highlight.py-correctly-set-permissions-on-file-to-be.patch
+++ /dev/null
@@ -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())
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 5674a38abd5..8c9bc954420 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 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.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
similarity index 90%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.31.bb
index fce03295341..4f97ce06333 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",
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"
--
2.17.1
next prev parent reply other threads:[~2019-08-20 15:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 15:32 [PATCH 01/12] linux-yocto: add drm-bochs support Alexander Kanavin
2019-08-20 15:32 ` [PATCH 02/12] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips Alexander Kanavin
2019-08-23 9:13 ` Richard Purdie
2019-08-23 10:34 ` Alexander Kanavin
2019-08-20 15:32 ` [PATCH 03/12] images: use 512M of RAM in qemu if 'opengl" is in DISTRO_FEATURES Alexander Kanavin
2019-08-20 15:32 ` [PATCH 04/12] python3-numpy: update to 1.17.0 Alexander Kanavin
2019-08-22 13:33 ` Richard Purdie
2019-08-22 15:07 ` Alexander Kanavin
2019-08-20 15:32 ` [PATCH 05/12] rt-tests: exclude another development version Alexander Kanavin
2019-08-20 15:32 ` [PATCH 06/12] libmodulemd: depend on target python at build time Alexander Kanavin
2019-08-20 15:32 ` [PATCH 07/12] createrepo-c: upgrade 0.14.3 -> 0.15.0 Alexander Kanavin
2019-08-20 15:32 ` Alexander Kanavin [this message]
2019-08-20 15:32 ` [PATCH 09/12] desktop-file-utils: upgrade 0.23 -> 0.24 Alexander Kanavin
2019-08-20 15:32 ` [PATCH 10/12] vala: upgrade 0.44.5 -> 0.44.7 Alexander Kanavin
2019-08-20 15:32 ` [PATCH 11/12] libdazzle: upgrade 3.32.2 -> 3.32.3 Alexander Kanavin
2019-08-20 15:32 ` [PATCH 12/12] epiphany: upgrade 3.32.3 -> 3.32.4 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190820153219.62435-8-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox