summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-02-02 19:38:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commit60190ae960e58dae2e1a7b681f0a52567db9c178 (patch)
tree6c92c3f1fdfa421298ee53524079ddedcc8af669
parentdcfe332645d7e7e8b926b9a11f937df1c38b86c9 (diff)
downloadpoky-60190ae960e58dae2e1a7b681f0a52567db9c178.tar.gz
gtk-doc: update to 1.27
Gtk-doc has been rewritten in Python, so drop perl dependencies (good riddance!), and adjust patches to reflect that. (From OE-Core rev: f4a00893a4209330720c0366ddde6b9941ee3196) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch40
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch155
-rw-r--r--meta/recipes-gnome/gtk-doc/files/conditionaltests.patch26
-rw-r--r--meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch22
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb (renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb)15
5 files changed, 119 insertions, 139 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch
deleted file mode 100644
index 4a9028742c..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From e733241fb580f032efbbe684ec35d4c9d27f1595 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 8 Sep 2016 13:38:39 +0300
4Subject: [PATCH] Do not error out if perl is not found or its version is too
5 old.
6
7This allows use to avoid depending on perl-native if we're not going
8to use it (when api-docs are disabled).
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 configure.ac | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 2a61d6e..29415bd 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -36,7 +36,7 @@ dnl Check for Perl.
21 dnl
22 AC_PATH_PROG([PERL], [perl])
23 if test -z "$PERL"; then
24- AC_MSG_ERROR([perl not found])
25+ AC_MSG_WARN([perl not found])
26 fi
27
28 AC_MSG_CHECKING([if Perl version >= 5.18.0])
29@@ -44,7 +44,7 @@ if "$PERL" -e "require v5.18.0"; then
30 AC_MSG_RESULT([yes])
31 else
32 AC_MSG_RESULT([no])
33- AC_MSG_ERROR([perl >= 5.18.0 is required for gtk-doc])
34+ AC_MSG_WARN([perl >= 5.18.0 is required for gtk-doc])
35 fi
36
37 dnl
38--
392.9.3
40
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
index 477fc9ae8c..2fe3ab9221 100644
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
+++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
@@ -1,7 +1,7 @@
1From 6fab82b93c7bd301eb42448515b02f7cb3306897 Mon Sep 17 00:00:00 2001 1From 928102874bc2339a1d57c6b178877e0c6002cb3a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 31 Aug 2016 16:44:46 +0300 3Date: Wed, 31 Aug 2016 16:44:46 +0300
4Subject: [PATCH] Do not hardocode paths to perl/python in scripts. 4Subject: [PATCH 1/3] Do not hardocode paths to perl/python in scripts.
5 5
6Doing so when the interpreters are somewhere deep in a sysroot directory 6Doing so when the interpreters are somewhere deep in a sysroot directory
7can reach the shebang line limit, and resulting scripts wouldn't work 7can reach the shebang line limit, and resulting scripts wouldn't work
@@ -9,131 +9,134 @@ on targets either.
9 9
10Upstream-Status: Inappropriate [oe-core specific] 10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 gtkdoc-check.in | 2 +- 14 gtkdoc-check.in | 2 +-
14 gtkdoc-common.pl.in | 2 +- 15 gtkdoc-depscan.in | 2 +-
15 gtkdoc-depscan.in | 2 +- 16 gtkdoc-fixxref.in | 2 +-
16 gtkdoc-fixxref.in | 2 +- 17 gtkdoc-mkdb.in | 2 +-
17 gtkdoc-mkdb.in | 2 +- 18 gtkdoc-mkhtml.in | 2 +-
18 gtkdoc-mktmpl.in | 2 +- 19 gtkdoc-mkman.in | 2 +-
19 gtkdoc-rebase.in | 2 +- 20 gtkdoc-mkpdf.in | 2 +-
20 gtkdoc-scan.in | 2 +- 21 gtkdoc-rebase.in | 2 +-
21 gtkdoc-scangobj.in | 2 +- 22 gtkdoc-scan.in | 2 +-
22 tests/tools.sh.in | 4 ++-- 23 gtkdoc-scangobj.in | 2 +-
23 10 files changed, 11 insertions(+), 11 deletions(-) 24 tests/tools.sh.in | 2 +-
25 11 files changed, 11 insertions(+), 11 deletions(-)
24 26
25diff --git a/gtkdoc-check.in b/gtkdoc-check.in 27diff --git a/gtkdoc-check.in b/gtkdoc-check.in
26index 560d69b..b60857f 100755 28index 8c8e917..f6a25f6 100755
27--- a/gtkdoc-check.in 29--- a/gtkdoc-check.in
28+++ b/gtkdoc-check.in 30+++ b/gtkdoc-check.in
29@@ -1,4 +1,4 @@ 31@@ -1,4 +1,4 @@
30-#!@PERL@ -w 32-#!@PYTHON@
31+#!/usr/bin/env perl 33+#!/usr/bin/env python3
32 # -*- cperl -*- 34 # -*- python; coding: utf-8 -*-
33 #
34 # gtk-doc - GTK DocBook documentation generator.
35diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in
36index 4747396..cfadb78 100644
37--- a/gtkdoc-common.pl.in
38+++ b/gtkdoc-common.pl.in
39@@ -1,4 +1,4 @@
40-#!@PERL@ -w
41+#!/usr/bin/env perl
42 # -*- cperl -*-
43 # 35 #
44 # gtk-doc - GTK DocBook documentation generator. 36 # gtk-doc - GTK DocBook documentation generator.
45diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in 37diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
46index 83af01b..917e247 100644 38index 9bfaf30..aadc952 100644
47--- a/gtkdoc-depscan.in 39--- a/gtkdoc-depscan.in
48+++ b/gtkdoc-depscan.in 40+++ b/gtkdoc-depscan.in
49@@ -1,4 +1,4 @@ 41@@ -1,4 +1,4 @@
50-#!@PYTHON@ 42-#!@PYTHON@
51+#!/usr/bin/env python 43+#!/usr/bin/env python3
52 44
53 import gzip, os.path, re 45 from __future__ import print_function
54 46
55diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in 47diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
56index 3d9e8d0..d55190b 100755 48index 0ea02d4..bdd443a 100755
57--- a/gtkdoc-fixxref.in 49--- a/gtkdoc-fixxref.in
58+++ b/gtkdoc-fixxref.in 50+++ b/gtkdoc-fixxref.in
59@@ -1,4 +1,4 @@ 51@@ -1,4 +1,4 @@
60-#!@PERL@ -w 52-#!@PYTHON@
61+#!/usr/bin/env perl 53+#!/usr/bin/env python3
62 # -*- cperl -*- 54 # -*- python -*-
63 # 55 #
64 # gtk-doc - GTK DocBook documentation generator. 56 # gtk-doc - GTK DocBook documentation generator.
65diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in 57diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
66index 8dd6d5e..d808750 100755 58index 42d5731..3a56d56 100755
67--- a/gtkdoc-mkdb.in 59--- a/gtkdoc-mkdb.in
68+++ b/gtkdoc-mkdb.in 60+++ b/gtkdoc-mkdb.in
69@@ -1,4 +1,4 @@ 61@@ -1,4 +1,4 @@
70-#!@PERL@ -w 62-#!@PYTHON@
71+#!/usr/bin/env perl 63+#!/usr/bin/env python3
72 # -*- cperl -*- 64 # -*- python; coding: utf-8 -*-
65 #
66 # gtk-doc - GTK DocBook documentation generator.
67diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
68index 0d0a15d..914ff55 100644
69--- a/gtkdoc-mkhtml.in
70+++ b/gtkdoc-mkhtml.in
71@@ -1,4 +1,4 @@
72-#!@PYTHON@
73+#!/usr/bin/env python3
74 # -*- python; coding: utf-8 -*-
73 # 75 #
74 # gtk-doc - GTK DocBook documentation generator. 76 # gtk-doc - GTK DocBook documentation generator.
75diff --git a/gtkdoc-mktmpl.in b/gtkdoc-mktmpl.in 77diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in
76index c64dfd3..2f46c18 100755 78index c5445cd..65db71a 100644
77--- a/gtkdoc-mktmpl.in 79--- a/gtkdoc-mkman.in
78+++ b/gtkdoc-mktmpl.in 80+++ b/gtkdoc-mkman.in
79@@ -1,4 +1,4 @@ 81@@ -1,4 +1,4 @@
80-#!@PERL@ -w 82-#!@PYTHON@
81+#!/usr/bin/env perl 83+#!/usr/bin/env python3
82 # -*- cperl -*- 84 # -*- python; coding: utf-8 -*-
85 #
86 # gtk-doc - GTK DocBook documentation generator.
87diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in
88index e8c0c03..f807236 100755
89--- a/gtkdoc-mkpdf.in
90+++ b/gtkdoc-mkpdf.in
91@@ -1,4 +1,4 @@
92-#!@PYTHON@
93+#!/usr/bin/env python3
94 # -*- python; coding: utf-8 -*-
83 # 95 #
84 # gtk-doc - GTK DocBook documentation generator. 96 # gtk-doc - GTK DocBook documentation generator.
85diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in 97diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in
86index 375482d..cf05b45 100644 98index 17a71c2..ec3fd28 100755
87--- a/gtkdoc-rebase.in 99--- a/gtkdoc-rebase.in
88+++ b/gtkdoc-rebase.in 100+++ b/gtkdoc-rebase.in
89@@ -1,4 +1,4 @@ 101@@ -1,4 +1,4 @@
90-#!@PERL@ -w 102-#!@PYTHON@
91+#!/usr/bin/env perl 103+#!/usr/bin/env python3
92 # -*- cperl -*- 104 # -*- python -*-
93 # 105 #
94 # gtk-doc - GTK DocBook documentation generator. 106 # gtk-doc - GTK DocBook documentation generator.
95diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in 107diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
96index 048e5c9..78c6136 100755 108index 954c811..f461504 100755
97--- a/gtkdoc-scan.in 109--- a/gtkdoc-scan.in
98+++ b/gtkdoc-scan.in 110+++ b/gtkdoc-scan.in
99@@ -1,4 +1,4 @@ 111@@ -1,4 +1,4 @@
100-#!@PERL@ -w 112-#!@PYTHON@
101+#!/usr/bin/env perl 113+#!/usr/bin/env python3
102 # -*- cperl -*- 114 # -*- python -*-
103 # 115 #
104 # gtk-doc - GTK DocBook documentation generator. 116 # gtk-doc - GTK DocBook documentation generator.
105diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in 117diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
106index fb66b76..67ee8f7 100644 118index 4cbe130..52c2c24 100644
107--- a/gtkdoc-scangobj.in 119--- a/gtkdoc-scangobj.in
108+++ b/gtkdoc-scangobj.in 120+++ b/gtkdoc-scangobj.in
109@@ -1,4 +1,4 @@ 121@@ -1,4 +1,4 @@
110-#!@PERL@ -w 122-#!@PYTHON@
111+#!/usr/bin/env perl 123+#!/usr/bin/env python3
112 # -*- cperl -*- 124 # -*- python -*-
113 # 125 #
114 # gtk-doc - GTK DocBook documentation generator. 126 # gtk-doc - GTK DocBook documentation generator.
115diff --git a/tests/tools.sh.in b/tests/tools.sh.in 127diff --git a/tests/tools.sh.in b/tests/tools.sh.in
116index a114a42..7073883 100644 128index 4d301d0..565fc1e 100644
117--- a/tests/tools.sh.in 129--- a/tests/tools.sh.in
118+++ b/tests/tools.sh.in 130+++ b/tests/tools.sh.in
119@@ -11,7 +11,7 @@ echo "Running suite(s): gtk-doc-$suite"; 131@@ -31,7 +31,7 @@ done
120 132 # TODO: test python 2 and 3 (python3 -mcompileall gtkdoc/*.py)
121 # test perl scripts 133 for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do
122 for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do 134 fullfile=`which $file`
123- @PERL@ -cwT `which $file` 135- @PYTHON@ -m py_compile $fullfile
124+ perl -cwT `which $file` 136+ python3 -m py_compile $fullfile
125 if test $? = 1 ; then failed=`expr $failed + 1`; fi 137 if test $? != 0 ; then failed=`expr $failed + 1`; fi
126 tested=`expr $tested + 1` 138 tested=`expr $tested + 1`
127 done 139 done
128@@ -34,7 +34,7 @@ done
129
130
131 # test python scripts
132-@PYTHON@ -m py_compile `which gtkdoc-depscan`
133+python -m py_compile `which gtkdoc-depscan`
134 if test $? != 0 ; then failed=`expr $failed + 1`; fi
135 tested=`expr $tested + 1`
136
137-- 140--
1382.9.3 1412.14.1
139 142
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
index 0c180f2605..21c2db7826 100644
--- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
+++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
@@ -1,14 +1,23 @@
1From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 27 Jun 2017 21:00:58 +0100
4Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency
5
1Allow the tests to be explicitly disabled to avoid floating dependnecy 6Allow the tests to be explicitly disabled to avoid floating dependnecy
2issues. This is not really an issue with RSS but is on previous releases. 7issues. This is not really an issue with RSS but is on previous releases.
3 8
4RP 2017/6/27 9RP 2017/6/27
5Upstream-Status: Pending 10Upstream-Status: Pending
6 11
7Index: gtk-doc-1.25/configure.ac 12---
8=================================================================== 13 configure.ac | 10 ++++++++++
9--- gtk-doc-1.25.orig/configure.ac 14 1 file changed, 10 insertions(+)
10+++ gtk-doc-1.25/configure.ac 15
11@@ -161,6 +161,11 @@ if test "x$GCC" = "xyes"; then 16diff --git a/configure.ac b/configure.ac
17index 684e2d1..e5e3aab 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then
12 fi 21 fi
13 fi 22 fi
14 23
@@ -20,7 +29,7 @@ Index: gtk-doc-1.25/configure.ac
20 dnl if glib is available we can enable the tests 29 dnl if glib is available we can enable the tests
21 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], 30 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
22 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" 31 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
23@@ -171,6 +176,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 > 32@@ -156,6 +161,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
24 build_tests="no" 33 build_tests="no"
25 ] 34 ]
26 ) 35 )
@@ -30,5 +39,8 @@ Index: gtk-doc-1.25/configure.ac
30+fi 39+fi
31+ 40+
32 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) 41 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
33 dnl this enable the rule in test/Makefile.am 42 dnl this enables the rule in test/Makefile.am
34 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) 43 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
44--
452.14.1
46
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 c7688704eb..bf03c8f613 100644
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
@@ -1,24 +1,31 @@
1Use native pkg-config when looking for gtk-doc. 1From 5f145621b4780cfd6a5632fcc97c45f572938efc Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 5 Sep 2016 22:25:44 +0100
4Subject: [PATCH 5/5] Use native pkg-config when looking for gtk-doc.
2 5
3Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
4Signed-off-by: Ross Burton <ross.burton@intel.com> 7Signed-off-by: Ross Burton <ross.burton@intel.com>
5 8
9---
10 gtk-doc.m4 | 7 ++++++-
11 1 file changed, 6 insertions(+), 1 deletion(-)
12
6diff --git a/gtk-doc.m4 b/gtk-doc.m4 13diff --git a/gtk-doc.m4 b/gtk-doc.m4
7index 3675543..94881ae 100644 14index 3675543..2590e2a 100644
8--- a/gtk-doc.m4 15--- a/gtk-doc.m4
9+++ b/gtk-doc.m4 16+++ b/gtk-doc.m4
10@@ -1,6 +1,6 @@ 17@@ -1,6 +1,6 @@
11 dnl -*- mode: autoconf -*- 18 dnl -*- mode: autoconf -*-
12 19
13-# serial 2 20-# serial 2
14+# serial 2.1 21+# serial 2.1
15 22
16 dnl Usage: 23 dnl Usage:
17 dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) 24 dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
18@@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK], 25@@ -10,11 +10,16 @@ AC_DEFUN([GTK_DOC_CHECK],
19 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first 26 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
20 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first 27 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
21 28
22+ gtkdoc_pkgconfig_save=$PKG_CONFIG 29+ gtkdoc_pkgconfig_save=$PKG_CONFIG
23+ PKG_CONFIG=pkg-config-native 30+ PKG_CONFIG=pkg-config-native
24+ 31+
@@ -26,9 +33,12 @@ index 3675543..94881ae 100644
26 AC_MSG_CHECKING([for gtk-doc]) 33 AC_MSG_CHECKING([for gtk-doc])
27 PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) 34 PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
28 AC_MSG_RESULT($have_gtk_doc) 35 AC_MSG_RESULT($have_gtk_doc)
29 36
30+ PKG_CONFIG=$gtkdoc_pkgconfig_save 37+ PKG_CONFIG=$gtkdoc_pkgconfig_save
31+ 38+
32 if test "$have_gtk_doc" = "no"; then 39 if test "$have_gtk_doc" = "no"; then
33 AC_MSG_WARN([ 40 AC_MSG_WARN([
34 You will not be able to create source packages with 'make dist' 41 You will not be able to create source packages with 'make dist'
42--
432.15.1
44
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
index e0eb994e25..b907bae147 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
@@ -15,22 +15,17 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
15# into its scripts. This means that target gtk-doc package is broken; 15# into its scripts. This means that target gtk-doc package is broken;
16# hopefully no one minds because its scripts are not used for anything during build 16# hopefully no one minds because its scripts are not used for anything during build
17# and shouldn't be used on targets. 17# and shouldn't be used on targets.
18PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native perl-native" 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
21# We cannot use host perl, because it may be too old for gtk-doc 21SRC_URI[archive.md5sum] = "b29949e0964762e474b706ce22171602"
22EXTRANATIVEPATH += "perl-native" 22SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6d56e1b0c6d9a6f"
23
24SRC_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 \
25 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 \
26 file://0001-Do-not-error-out-if-perl-is-not-found-or-its-version.patch \ 25 file://conditionaltests.patch \
27 file://conditionaltests.patch \
28 " 26 "
29SRC_URI_append_class-native = " file://pkg-config-native.patch" 27SRC_URI_append_class-native = " file://pkg-config-native.patch"
30 28
31SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc"
32SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"
33
34BBCLASSEXTEND = "native nativesdk" 29BBCLASSEXTEND = "native nativesdk"
35 30
36# Do not check for XML catalogs when building because that 31# Do not check for XML catalogs when building because that