diff options
Diffstat (limited to 'meta/recipes-gnome/gtk-doc/files')
6 files changed, 23 insertions, 57 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch index 99ae4d4417..ee1acda401 100644 --- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8b7fbbb405959f2868ad6eadd7dd00018758a8a5 Mon Sep 17 00:00:00 2001 | 1 | From 50d3b9d3ca0e1ff47c8e7559303855530e58839a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 7 Sep 2016 14:52:04 +0300 | 3 | Date: Wed, 7 Sep 2016 14:52:04 +0300 |
4 | Subject: [PATCH] Do not error out if xsltproc is not found. | 4 | Subject: [PATCH] Do not error out if xsltproc is not found. |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index b0c88d7..2a61d6e 100644 | 17 | index 8725074..0491090 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -58,7 +58,7 @@ dnl Check for xsltproc | 20 | @@ -37,7 +37,7 @@ dnl Check for xsltproc |
21 | dnl | 21 | dnl |
22 | AC_PATH_PROG([XSLTPROC], [xsltproc]) | 22 | AC_PATH_PROG([XSLTPROC], [xsltproc]) |
23 | if test -z "$XSLTPROC"; then | 23 | if test -z "$XSLTPROC"; then |
@@ -26,6 +26,3 @@ index b0c88d7..2a61d6e 100644 | |||
26 | fi | 26 | fi |
27 | 27 | ||
28 | dnl | 28 | dnl |
29 | -- | ||
30 | 2.9.3 | ||
31 | |||
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 19e05f1b99..f329539fa8 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,4 +1,4 @@ | |||
1 | From 80e6aff72affa6d92f5abd7ff6353dfc4a7bff38 Mon Sep 17 00:00:00 2001 | 1 | From 64163565f8d6853b02e53308a6e6ba23d9d96299 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 | 3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 |
4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. | 4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. |
@@ -9,7 +9,6 @@ on targets either. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | gtkdoc-check.in | 2 +- | 13 | gtkdoc-check.in | 2 +- |
15 | gtkdoc-depscan.in | 2 +- | 14 | gtkdoc-depscan.in | 2 +- |
@@ -25,7 +24,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
25 | 11 files changed, 11 insertions(+), 11 deletions(-) | 24 | 11 files changed, 11 insertions(+), 11 deletions(-) |
26 | 25 | ||
27 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in | 26 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in |
28 | index 8c8e917..f6a25f6 100755 | 27 | index d9e2ad5..9ec526d 100755 |
29 | --- a/gtkdoc-check.in | 28 | --- a/gtkdoc-check.in |
30 | +++ b/gtkdoc-check.in | 29 | +++ b/gtkdoc-check.in |
31 | @@ -1,4 +1,4 @@ | 30 | @@ -1,4 +1,4 @@ |
@@ -35,7 +34,7 @@ index 8c8e917..f6a25f6 100755 | |||
35 | # | 34 | # |
36 | # gtk-doc - GTK DocBook documentation generator. | 35 | # gtk-doc - GTK DocBook documentation generator. |
37 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in | 36 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in |
38 | index 9bfaf30..aadc952 100755 | 37 | index c43317c..200837c 100755 |
39 | --- a/gtkdoc-depscan.in | 38 | --- a/gtkdoc-depscan.in |
40 | +++ b/gtkdoc-depscan.in | 39 | +++ b/gtkdoc-depscan.in |
41 | @@ -1,4 +1,4 @@ | 40 | @@ -1,4 +1,4 @@ |
@@ -45,7 +44,7 @@ index 9bfaf30..aadc952 100755 | |||
45 | from __future__ import print_function | 44 | from __future__ import print_function |
46 | 45 | ||
47 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in | 46 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in |
48 | index 44f6bd1..26fbd93 100755 | 47 | index f9c4905..ed2ead1 100755 |
49 | --- a/gtkdoc-fixxref.in | 48 | --- a/gtkdoc-fixxref.in |
50 | +++ b/gtkdoc-fixxref.in | 49 | +++ b/gtkdoc-fixxref.in |
51 | @@ -1,4 +1,4 @@ | 50 | @@ -1,4 +1,4 @@ |
@@ -55,7 +54,7 @@ index 44f6bd1..26fbd93 100755 | |||
55 | # | 54 | # |
56 | # gtk-doc - GTK DocBook documentation generator. | 55 | # gtk-doc - GTK DocBook documentation generator. |
57 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in | 56 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in |
58 | index 42d5731..3a56d56 100755 | 57 | index 641f3c4..35e95fb 100755 |
59 | --- a/gtkdoc-mkdb.in | 58 | --- a/gtkdoc-mkdb.in |
60 | +++ b/gtkdoc-mkdb.in | 59 | +++ b/gtkdoc-mkdb.in |
61 | @@ -1,4 +1,4 @@ | 60 | @@ -1,4 +1,4 @@ |
@@ -65,7 +64,7 @@ index 42d5731..3a56d56 100755 | |||
65 | # | 64 | # |
66 | # gtk-doc - GTK DocBook documentation generator. | 65 | # gtk-doc - GTK DocBook documentation generator. |
67 | diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in | 66 | diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in |
68 | index 0d0a15d..914ff55 100755 | 67 | index b09f7a9..8d45966 100755 |
69 | --- a/gtkdoc-mkhtml.in | 68 | --- a/gtkdoc-mkhtml.in |
70 | +++ b/gtkdoc-mkhtml.in | 69 | +++ b/gtkdoc-mkhtml.in |
71 | @@ -1,4 +1,4 @@ | 70 | @@ -1,4 +1,4 @@ |
@@ -75,7 +74,7 @@ index 0d0a15d..914ff55 100755 | |||
75 | # | 74 | # |
76 | # gtk-doc - GTK DocBook documentation generator. | 75 | # gtk-doc - GTK DocBook documentation generator. |
77 | diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in | 76 | diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in |
78 | index c5445cd..65db71a 100755 | 77 | index 8f7b018..9bac0b6 100755 |
79 | --- a/gtkdoc-mkman.in | 78 | --- a/gtkdoc-mkman.in |
80 | +++ b/gtkdoc-mkman.in | 79 | +++ b/gtkdoc-mkman.in |
81 | @@ -1,4 +1,4 @@ | 80 | @@ -1,4 +1,4 @@ |
@@ -85,7 +84,7 @@ index c5445cd..65db71a 100755 | |||
85 | # | 84 | # |
86 | # gtk-doc - GTK DocBook documentation generator. | 85 | # gtk-doc - GTK DocBook documentation generator. |
87 | diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in | 86 | diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in |
88 | index e8c0c03..f807236 100755 | 87 | index 7dca4b0..808f92d 100755 |
89 | --- a/gtkdoc-mkpdf.in | 88 | --- a/gtkdoc-mkpdf.in |
90 | +++ b/gtkdoc-mkpdf.in | 89 | +++ b/gtkdoc-mkpdf.in |
91 | @@ -1,4 +1,4 @@ | 90 | @@ -1,4 +1,4 @@ |
@@ -95,7 +94,7 @@ index e8c0c03..f807236 100755 | |||
95 | # | 94 | # |
96 | # gtk-doc - GTK DocBook documentation generator. | 95 | # gtk-doc - GTK DocBook documentation generator. |
97 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in | 96 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in |
98 | index 17a71c2..ec3fd28 100755 | 97 | index e8b0bf5..a960d8f 100755 |
99 | --- a/gtkdoc-rebase.in | 98 | --- a/gtkdoc-rebase.in |
100 | +++ b/gtkdoc-rebase.in | 99 | +++ b/gtkdoc-rebase.in |
101 | @@ -1,4 +1,4 @@ | 100 | @@ -1,4 +1,4 @@ |
@@ -105,7 +104,7 @@ index 17a71c2..ec3fd28 100755 | |||
105 | # | 104 | # |
106 | # gtk-doc - GTK DocBook documentation generator. | 105 | # gtk-doc - GTK DocBook documentation generator. |
107 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in | 106 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in |
108 | index 954c811..f461504 100755 | 107 | index 7893ebc..b7eb83d 100755 |
109 | --- a/gtkdoc-scan.in | 108 | --- a/gtkdoc-scan.in |
110 | +++ b/gtkdoc-scan.in | 109 | +++ b/gtkdoc-scan.in |
111 | @@ -1,4 +1,4 @@ | 110 | @@ -1,4 +1,4 @@ |
@@ -115,7 +114,7 @@ index 954c811..f461504 100755 | |||
115 | # | 114 | # |
116 | # gtk-doc - GTK DocBook documentation generator. | 115 | # gtk-doc - GTK DocBook documentation generator. |
117 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in | 116 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in |
118 | index 4cbe130..52c2c24 100755 | 117 | index 7660c70..c6ff072 100755 |
119 | --- a/gtkdoc-scangobj.in | 118 | --- a/gtkdoc-scangobj.in |
120 | +++ b/gtkdoc-scangobj.in | 119 | +++ b/gtkdoc-scangobj.in |
121 | @@ -1,4 +1,4 @@ | 120 | @@ -1,4 +1,4 @@ |
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch deleted file mode 100644 index f40124877c..0000000000 --- a/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Fri, 8 Dec 2023 10:35:25 +0000 | ||
4 | Subject: [PATCH] Don't use docdir from environment | ||
5 | |||
6 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73] | ||
7 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
8 | --- | ||
9 | buildsystems/autotools/gtkdocize.in | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in | ||
13 | index 83127bf..76dcbfd 100755 | ||
14 | --- a/buildsystems/autotools/gtkdocize.in | ||
15 | +++ b/buildsystems/autotools/gtkdocize.in | ||
16 | @@ -39,7 +39,7 @@ set - $args | ||
17 | |||
18 | # assume working directory if srcdir is not set | ||
19 | test "$srcdir" || srcdir=. | ||
20 | -test "$docdir" || docdir="$srcdir" | ||
21 | +docdir="$srcdir" | ||
22 | |||
23 | # detect configure script | ||
24 | no_configure_found=0 | ||
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch index 21c2db7826..55cae34b46 100644 --- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch +++ b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch | |||
@@ -1,23 +1,22 @@ | |||
1 | From 78bbf185934147a69ceb4b617d424e12e70997bf Mon Sep 17 00:00:00 2001 | 1 | From 9aa9230a305e964b2417daea2b51e43b2dee607c Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 | 3 | Date: Tue, 27 Jun 2017 21:00:58 +0100 |
4 | Subject: [PATCH 3/3] gtk-doc: Handle floating gtk-doc dependency | 4 | Subject: [PATCH] gtk-doc: Handle floating gtk-doc dependency |
5 | 5 | ||
6 | Allow the tests to be explicitly disabled to avoid floating dependnecy | 6 | Allow the tests to be explicitly disabled to avoid floating dependnecy |
7 | issues. This is not really an issue with RSS but is on previous releases. | 7 | issues. This is not really an issue with RSS but is on previous releases. |
8 | 8 | ||
9 | RP 2017/6/27 | 9 | RP 2017/6/27 |
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | |||
12 | --- | 11 | --- |
13 | configure.ac | 10 ++++++++++ | 12 | configure.ac | 10 ++++++++++ |
14 | 1 file changed, 10 insertions(+) | 13 | 1 file changed, 10 insertions(+) |
15 | 14 | ||
16 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
17 | index 684e2d1..e5e3aab 100644 | 16 | index 0491090..4270c88 100644 |
18 | --- a/configure.ac | 17 | --- a/configure.ac |
19 | +++ b/configure.ac | 18 | +++ b/configure.ac |
20 | @@ -146,6 +146,11 @@ if test "x$GCC" = "xyes"; then | 19 | @@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then |
21 | fi | 20 | fi |
22 | fi | 21 | fi |
23 | 22 | ||
@@ -29,7 +28,7 @@ index 684e2d1..e5e3aab 100644 | |||
29 | dnl if glib is available we can enable the tests | 28 | dnl if glib is available we can enable the tests |
30 | PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], | 29 | PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
31 | [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`" | 30 | [ glib_prefix="`$PKG_CONFIG --variable=prefix 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], | 31 | @@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], |
33 | build_tests="no" | 32 | build_tests="no" |
34 | ] | 33 | ] |
35 | ) | 34 | ) |
@@ -41,6 +40,3 @@ index 684e2d1..e5e3aab 100644 | |||
41 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) | 40 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes ) |
42 | dnl this enables the rule in test/Makefile.am | 41 | dnl this enables the rule in test/Makefile.am |
43 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) | 42 | AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes) |
44 | -- | ||
45 | 2.14.1 | ||
46 | |||
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch index d1695479dc..90207d6c12 100644 --- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch +++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001 | 1 | From fa5e31e02b9d3c6c5ec3cdc1f34dd6c179520fd0 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 21 Mar 2018 14:47:29 +0000 | 3 | Date: Wed, 21 Mar 2018 14:47:29 +0000 |
4 | Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install | 4 | Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install |
@@ -20,16 +20,15 @@ files which don't already exist. | |||
20 | 20 | ||
21 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] | 21 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] |
22 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 22 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
23 | |||
24 | --- | 23 | --- |
25 | buildsystems/autotools/gtk-doc.make | 2 +- | 24 | buildsystems/autotools/gtk-doc.make | 2 +- |
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
27 | 26 | ||
28 | diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make | 27 | diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make |
29 | index 7d9a27f..8cb336d 100644 | 28 | index fb2e7e2..4f6fe2b 100644 |
30 | --- a/buildsystems/autotools/gtk-doc.make | 29 | --- a/buildsystems/autotools/gtk-doc.make |
31 | +++ b/buildsystems/autotools/gtk-doc.make | 30 | +++ b/buildsystems/autotools/gtk-doc.make |
32 | @@ -111,7 +111,7 @@ setup-build.stamp: | 31 | @@ -112,7 +112,7 @@ setup-build.stamp: |
33 | destdir=`dirname $(abs_builddir)/$$file`; \ | 32 | destdir=`dirname $(abs_builddir)/$$file`; \ |
34 | test -d "$$destdir" || mkdir -p "$$destdir"; \ | 33 | test -d "$$destdir" || mkdir -p "$$destdir"; \ |
35 | test -f $(abs_srcdir)/$$file && \ | 34 | test -f $(abs_srcdir)/$$file && \ |
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 1d260aa72b..1b5c190f56 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From ebb0f7313a0931f646e86badce2627eff2fa37a8 Mon Sep 17 00:00:00 2001 | 1 | From c11fba9bcb8d55568067e626bd959841c05081e5 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 | 3 | Date: Mon, 5 Sep 2016 22:25:44 +0100 |
4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. | 4 | Subject: [PATCH] Use native pkg-config when looking for gtk-doc. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
9 | --- | 8 | --- |
10 | buildsystems/autotools/gtk-doc.m4 | 7 ++++++- | 9 | buildsystems/autotools/gtk-doc.m4 | 7 ++++++- |
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | 10 | 1 file changed, 6 insertions(+), 1 deletion(-) |