summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-09-06 12:29:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:06 +0100
commit0c4e26f49c548bae8bbaac01545d0c4df368e495 (patch)
tree4f34ed1be3a41e72786b00a9ea666563774efe28
parentaae1276f9630aa1ba70921d02f79c4074dbdd677 (diff)
downloadpoky-0c4e26f49c548bae8bbaac01545d0c4df368e495.tar.gz
gtk-doc: update to 1.29
(From OE-Core rev: 264fc66963d1700f374dd4cfcf107ba2487f4759) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch25
-rw-r--r--meta/recipes-gnome/gtk-doc/files/no-clobber.patch23
-rw-r--r--meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch6
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb (renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb)4
4 files changed, 34 insertions, 24 deletions
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 2fe3ab9221..19e05f1b99 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 928102874bc2339a1d57c6b178877e0c6002cb3a Mon Sep 17 00:00:00 2001 1From 80e6aff72affa6d92f5abd7ff6353dfc4a7bff38 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 1/3] Do not hardocode paths to perl/python in scripts. 4Subject: [PATCH] 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
@@ -35,7 +35,7 @@ index 8c8e917..f6a25f6 100755
35 # 35 #
36 # gtk-doc - GTK DocBook documentation generator. 36 # gtk-doc - GTK DocBook documentation generator.
37diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in 37diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
38index 9bfaf30..aadc952 100644 38index 9bfaf30..aadc952 100755
39--- a/gtkdoc-depscan.in 39--- a/gtkdoc-depscan.in
40+++ b/gtkdoc-depscan.in 40+++ b/gtkdoc-depscan.in
41@@ -1,4 +1,4 @@ 41@@ -1,4 +1,4 @@
@@ -45,7 +45,7 @@ index 9bfaf30..aadc952 100644
45 from __future__ import print_function 45 from __future__ import print_function
46 46
47diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in 47diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
48index 0ea02d4..bdd443a 100755 48index 44f6bd1..26fbd93 100755
49--- a/gtkdoc-fixxref.in 49--- a/gtkdoc-fixxref.in
50+++ b/gtkdoc-fixxref.in 50+++ b/gtkdoc-fixxref.in
51@@ -1,4 +1,4 @@ 51@@ -1,4 +1,4 @@
@@ -65,7 +65,7 @@ index 42d5731..3a56d56 100755
65 # 65 #
66 # gtk-doc - GTK DocBook documentation generator. 66 # gtk-doc - GTK DocBook documentation generator.
67diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in 67diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
68index 0d0a15d..914ff55 100644 68index 0d0a15d..914ff55 100755
69--- a/gtkdoc-mkhtml.in 69--- a/gtkdoc-mkhtml.in
70+++ b/gtkdoc-mkhtml.in 70+++ b/gtkdoc-mkhtml.in
71@@ -1,4 +1,4 @@ 71@@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 0d0a15d..914ff55 100644
75 # 75 #
76 # gtk-doc - GTK DocBook documentation generator. 76 # gtk-doc - GTK DocBook documentation generator.
77diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in 77diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in
78index c5445cd..65db71a 100644 78index c5445cd..65db71a 100755
79--- a/gtkdoc-mkman.in 79--- a/gtkdoc-mkman.in
80+++ b/gtkdoc-mkman.in 80+++ b/gtkdoc-mkman.in
81@@ -1,4 +1,4 @@ 81@@ -1,4 +1,4 @@
@@ -115,7 +115,7 @@ index 954c811..f461504 100755
115 # 115 #
116 # gtk-doc - GTK DocBook documentation generator. 116 # gtk-doc - GTK DocBook documentation generator.
117diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in 117diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
118index 4cbe130..52c2c24 100644 118index 4cbe130..52c2c24 100755
119--- a/gtkdoc-scangobj.in 119--- a/gtkdoc-scangobj.in
120+++ b/gtkdoc-scangobj.in 120+++ b/gtkdoc-scangobj.in
121@@ -1,4 +1,4 @@ 121@@ -1,4 +1,4 @@
@@ -125,18 +125,15 @@ index 4cbe130..52c2c24 100644
125 # 125 #
126 # gtk-doc - GTK DocBook documentation generator. 126 # gtk-doc - GTK DocBook documentation generator.
127diff --git a/tests/tools.sh.in b/tests/tools.sh.in 127diff --git a/tests/tools.sh.in b/tests/tools.sh.in
128index 4d301d0..565fc1e 100644 128index 343844a..9dc6692 100644
129--- a/tests/tools.sh.in 129--- a/tests/tools.sh.in
130+++ b/tests/tools.sh.in 130+++ b/tests/tools.sh.in
131@@ -31,7 +31,7 @@ done 131@@ -30,7 +30,7 @@ done
132 # TODO: test python 2 and 3 (python3 -mcompileall gtkdoc/*.py) 132 # TODO: also test the module files
133 for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do 133 for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkhtml2 gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do
134 fullfile=`which $file` 134 fullfile=`which $file`
135- @PYTHON@ -m py_compile $fullfile 135- @PYTHON@ -m py_compile $fullfile
136+ python3 -m py_compile $fullfile 136+ python3 -m py_compile $fullfile
137 if test $? != 0 ; then failed=`expr $failed + 1`; fi 137 if test $? != 0 ; then failed=`expr $failed + 1`; fi
138 tested=`expr $tested + 1` 138 tested=`expr $tested + 1`
139 done 139 done
140--
1412.14.1
142
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
index 0fa22b2097..d1695479dc 100644
--- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
+++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
@@ -1,3 +1,8 @@
1From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 21 Mar 2018 14:47:29 +0000
4Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install
5
1In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. 6In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir.
2 7
3However, if some of this content is regenerated at configure time this can happen: 8However, if some of this content is regenerated at configure time this can happen:
@@ -16,12 +21,20 @@ files which don't already exist.
16Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] 21Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571]
17Signed-off-by: Ross Burton <ross.burton@intel.com> 22Signed-off-by: Ross Burton <ross.burton@intel.com>
18 23
19diff --git a/gtk-doc.make b/gtk-doc.make 24---
20index f87eaab..246f3c0 100644 25 buildsystems/autotools/gtk-doc.make | 2 +-
21--- a/gtk-doc.make 26 1 file changed, 1 insertion(+), 1 deletion(-)
22+++ b/gtk-doc.make 27
23@@ -113,3 +113,3 @@ setup-build.stamp: 28diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make
29index 7d9a27f..8cb336d 100644
30--- a/buildsystems/autotools/gtk-doc.make
31+++ b/buildsystems/autotools/gtk-doc.make
32@@ -111,7 +111,7 @@ setup-build.stamp:
33 destdir=`dirname $(abs_builddir)/$$file`; \
34 test -d "$$destdir" || mkdir -p "$$destdir"; \
24 test -f $(abs_srcdir)/$$file && \ 35 test -f $(abs_srcdir)/$$file && \
25- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ 36- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
26+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ 37+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
27 done; \ 38 done; \
39 fi; \
40 fi
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 b77b5a5bcd..9b128e1ce1 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 @@
1From ae29d175016accd8a05ab1e52fc6435ac6291cfc Mon Sep 17 00:00:00 2001 1From 04af15322f677db42ecc2acc465334a04de9a871 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] Use native pkg-config when looking for gtk-doc. 4Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
@@ -12,8 +12,8 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
12 12
13diff --git a/gtk-doc.m4 b/gtk-doc.m4 13diff --git a/gtk-doc.m4 b/gtk-doc.m4
14index 2d12f01..e5afc3f 100644 14index 2d12f01..e5afc3f 100644
15--- a/gtk-doc.m4 15--- a/buildsystems/autotools/gtk-doc.m4
16+++ b/gtk-doc.m4 16+++ b/buildsystems/autotools/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.28.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb
index a2ec6ac78f..2c4ee175a9 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.28.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.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] = "48550c33f9b9b530f9e5f397979b613a" 21SRC_URI[archive.md5sum] = "df26a38c209b3d7358f26268fcbdb9e3"
22SRC_URI[archive.sha256sum] = "911e29e302252c96128965ee1f4067d5431a88e00ad1023a8bc1d6b922af5715" 22SRC_URI[archive.sha256sum] = "14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"
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 \