From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 4/8] gtk-doc: upgrade 1.29 -> 1.30
Date: Fri, 31 May 2019 17:56:08 +0200 [thread overview]
Message-ID: <20190531155612.75663-4-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20190531155612.75663-1-alex.kanavin@gmail.com>
Source-highlight support has been replaced upstream with python3-pygments.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | 6 +++---
.../gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb} | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb} (87%)
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 9b128e1ce12..3e973a16eb0 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 04af15322f677db42ecc2acc465334a04de9a871 Mon Sep 17 00:00:00 2001
+From a3f69f2ed45efbdaee47c2dde4df3d78323300e5 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.
@@ -7,10 +7,10 @@ Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
- gtk-doc.m4 | 7 ++++++-
+ buildsystems/autotools/gtk-doc.m4 | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/gtk-doc.m4 b/gtk-doc.m4
+diff --git a/buildsystems/autotools/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
index 2d12f01..e5afc3f 100644
--- a/buildsystems/autotools/gtk-doc.m4
+++ b/buildsystems/autotools/gtk-doc.m4
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
similarity index 87%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
index 2c4ee175a95..f16847e40c1 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
@@ -15,11 +15,11 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
# into its scripts. This means that target gtk-doc package is broken;
# hopefully no one minds because its scripts are not used for anything during build
# and shouldn't be used on targets.
-PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six"
+PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
-SRC_URI[archive.md5sum] = "df26a38c209b3d7358f26268fcbdb9e3"
-SRC_URI[archive.sha256sum] = "14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"
+SRC_URI[archive.md5sum] = "1045ba29ca0693ced2045523407aae4c"
+SRC_URI[archive.sha256sum] = "a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e"
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 \
--
2.17.1
next prev parent reply other threads:[~2019-05-31 15:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 15:56 [PATCH 1/8] liburcu: update to 0.11.0 Alexander Kanavin
2019-05-31 15:56 ` [PATCH 2/8] perl: update to 5.30.0 Alexander Kanavin
2019-05-31 15:56 ` [PATCH 3/8] python3-pygments: add a recipe Alexander Kanavin
2019-05-31 15:56 ` Alexander Kanavin [this message]
2019-06-01 6:31 ` [PATCH 4/8] gtk-doc: upgrade 1.29 -> 1.30 Richard Purdie
2019-06-01 11:27 ` Alexander Kanavin
2019-05-31 15:56 ` [PATCH 5/8] source-highlight: remove the recipe Alexander Kanavin
2019-05-31 15:56 ` [PATCH 6/8] piglit: upgrade to latest revision Alexander Kanavin
2019-05-31 15:56 ` [PATCH 7/8] mesa: switch over to official git Alexander Kanavin
2019-05-31 16:25 ` Richard Purdie
2019-05-31 16:27 ` Burton, Ross
2019-06-01 11:31 ` Alexander Kanavin
2019-05-31 15:56 ` [PATCH 8/8] mesa-demos: switch to using " 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=20190531155612.75663-4-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