summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch12
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb (renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb)4
2 files changed, 8 insertions, 8 deletions
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 bfbc777ff8..b77b5a5bcd 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,7 +1,7 @@
1From 5f145621b4780cfd6a5632fcc97c45f572938efc Mon Sep 17 00:00:00 2001 1From ae29d175016accd8a05ab1e52fc6435ac6291cfc 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 5/5] Use native pkg-config when looking for gtk-doc. 4Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@intel.com> 7Signed-off-by: Ross Burton <ross.burton@intel.com>
@@ -10,10 +10,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
10 gtk-doc.m4 | 7 ++++++- 10 gtk-doc.m4 | 7 ++++++-
11 1 file changed, 6 insertions(+), 1 deletion(-) 11 1 file changed, 6 insertions(+), 1 deletion(-)
12 12
13Index: gtk-doc-1.27/gtk-doc.m4 13diff --git a/gtk-doc.m4 b/gtk-doc.m4
14=================================================================== 14index 2d12f01..e5afc3f 100644
15--- gtk-doc-1.27.orig/gtk-doc.m4 15--- a/gtk-doc.m4
16+++ gtk-doc-1.27/gtk-doc.m4 16+++ b/gtk-doc.m4
17@@ -25,7 +25,7 @@ 17@@ -25,7 +25,7 @@
18 # Macro appear in them. The GNU General Public License (GPL) does govern 18 # Macro appear in them. The GNU General Public License (GPL) does govern
19 # all other use of the material that constitutes the Autoconf Macro. 19 # all other use of the material that constitutes the Autoconf Macro.
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
index 45528111c1..a2ec6ac78f 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
@@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
18PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six" 18PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six"
19PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" 19PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
20 20
21SRC_URI[archive.md5sum] = "b29949e0964762e474b706ce22171602" 21SRC_URI[archive.md5sum] = "48550c33f9b9b530f9e5f397979b613a"
22SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6d56e1b0c6d9a6f" 22SRC_URI[archive.sha256sum] = "911e29e302252c96128965ee1f4067d5431a88e00ad1023a8bc1d6b922af5715"
23SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ 23SRC_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 \