summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk-doc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gtk-doc')
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch28
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch138
-rw-r--r--meta/recipes-gnome/gtk-doc/files/conditionaltests.patch42
-rw-r--r--meta/recipes-gnome/gtk-doc/files/no-clobber.patch39
-rw-r--r--meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch41
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb64
6 files changed, 0 insertions, 352 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
deleted file mode 100644
index ee1acda401..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 50d3b9d3ca0e1ff47c8e7559303855530e58839a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 7 Sep 2016 14:52:04 +0300
4Subject: [PATCH] Do not error out if xsltproc is not found.
5
6This allows us to drop the hard xsltproc dependency, if we're not
7going to actually run the gtkdoc scripts (when api documentation is
8disabled).
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index 8725074..0491090 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -37,7 +37,7 @@ dnl Check for xsltproc
21 dnl
22 AC_PATH_PROG([XSLTPROC], [xsltproc])
23 if test -z "$XSLTPROC"; then
24- AC_MSG_ERROR([xsltproc not found])
25+ AC_MSG_WARN([xsltproc not found])
26 fi
27
28 dnl
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
deleted file mode 100644
index f329539fa8..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
+++ /dev/null
@@ -1,138 +0,0 @@
1From 64163565f8d6853b02e53308a6e6ba23d9d96299 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 31 Aug 2016 16:44:46 +0300
4Subject: [PATCH] Do not hardocode paths to perl/python in scripts.
5
6Doing so when the interpreters are somewhere deep in a sysroot directory
7can reach the shebang line limit, and resulting scripts wouldn't work
8on targets either.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 gtkdoc-check.in | 2 +-
14 gtkdoc-depscan.in | 2 +-
15 gtkdoc-fixxref.in | 2 +-
16 gtkdoc-mkdb.in | 2 +-
17 gtkdoc-mkhtml.in | 2 +-
18 gtkdoc-mkman.in | 2 +-
19 gtkdoc-mkpdf.in | 2 +-
20 gtkdoc-rebase.in | 2 +-
21 gtkdoc-scan.in | 2 +-
22 gtkdoc-scangobj.in | 2 +-
23 tests/tools.sh.in | 2 +-
24 11 files changed, 11 insertions(+), 11 deletions(-)
25
26diff --git a/gtkdoc-check.in b/gtkdoc-check.in
27index d9e2ad5..9ec526d 100755
28--- a/gtkdoc-check.in
29+++ b/gtkdoc-check.in
30@@ -1,4 +1,4 @@
31-#!@PYTHON@
32+#!/usr/bin/env python3
33 # -*- python; coding: utf-8 -*-
34 #
35 # gtk-doc - GTK DocBook documentation generator.
36diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
37index c43317c..200837c 100755
38--- a/gtkdoc-depscan.in
39+++ b/gtkdoc-depscan.in
40@@ -1,4 +1,4 @@
41-#!@PYTHON@
42+#!/usr/bin/env python3
43
44 from __future__ import print_function
45
46diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
47index f9c4905..ed2ead1 100755
48--- a/gtkdoc-fixxref.in
49+++ b/gtkdoc-fixxref.in
50@@ -1,4 +1,4 @@
51-#!@PYTHON@
52+#!/usr/bin/env python3
53 # -*- python -*-
54 #
55 # gtk-doc - GTK DocBook documentation generator.
56diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
57index 641f3c4..35e95fb 100755
58--- a/gtkdoc-mkdb.in
59+++ b/gtkdoc-mkdb.in
60@@ -1,4 +1,4 @@
61-#!@PYTHON@
62+#!/usr/bin/env python3
63 # -*- python; coding: utf-8 -*-
64 #
65 # gtk-doc - GTK DocBook documentation generator.
66diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in
67index b09f7a9..8d45966 100755
68--- a/gtkdoc-mkhtml.in
69+++ b/gtkdoc-mkhtml.in
70@@ -1,4 +1,4 @@
71-#!@PYTHON@
72+#!/usr/bin/env python3
73 # -*- python; coding: utf-8 -*-
74 #
75 # gtk-doc - GTK DocBook documentation generator.
76diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in
77index 8f7b018..9bac0b6 100755
78--- a/gtkdoc-mkman.in
79+++ b/gtkdoc-mkman.in
80@@ -1,4 +1,4 @@
81-#!@PYTHON@
82+#!/usr/bin/env python3
83 # -*- python; coding: utf-8 -*-
84 #
85 # gtk-doc - GTK DocBook documentation generator.
86diff --git a/gtkdoc-mkpdf.in b/gtkdoc-mkpdf.in
87index 7dca4b0..808f92d 100755
88--- a/gtkdoc-mkpdf.in
89+++ b/gtkdoc-mkpdf.in
90@@ -1,4 +1,4 @@
91-#!@PYTHON@
92+#!/usr/bin/env python3
93 # -*- python; coding: utf-8 -*-
94 #
95 # gtk-doc - GTK DocBook documentation generator.
96diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in
97index e8b0bf5..a960d8f 100755
98--- a/gtkdoc-rebase.in
99+++ b/gtkdoc-rebase.in
100@@ -1,4 +1,4 @@
101-#!@PYTHON@
102+#!/usr/bin/env python3
103 # -*- python -*-
104 #
105 # gtk-doc - GTK DocBook documentation generator.
106diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
107index 7893ebc..b7eb83d 100755
108--- a/gtkdoc-scan.in
109+++ b/gtkdoc-scan.in
110@@ -1,4 +1,4 @@
111-#!@PYTHON@
112+#!/usr/bin/env python3
113 # -*- python -*-
114 #
115 # gtk-doc - GTK DocBook documentation generator.
116diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
117index 7660c70..c6ff072 100755
118--- a/gtkdoc-scangobj.in
119+++ b/gtkdoc-scangobj.in
120@@ -1,4 +1,4 @@
121-#!@PYTHON@
122+#!/usr/bin/env python3
123 # -*- python -*-
124 #
125 # gtk-doc - GTK DocBook documentation generator.
126diff --git a/tests/tools.sh.in b/tests/tools.sh.in
127index 343844a..9dc6692 100644
128--- a/tests/tools.sh.in
129+++ b/tests/tools.sh.in
130@@ -30,7 +30,7 @@ done
131 # TODO: also test the module files
132 for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkhtml2 gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do
133 fullfile=`which $file`
134- @PYTHON@ -m py_compile $fullfile
135+ python3 -m py_compile $fullfile
136 if test $? != 0 ; then failed=`expr $failed + 1`; fi
137 tested=`expr $tested + 1`
138 done
diff --git a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
deleted file mode 100644
index 55cae34b46..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 9aa9230a305e964b2417daea2b51e43b2dee607c 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] gtk-doc: Handle floating gtk-doc dependency
5
6Allow the tests to be explicitly disabled to avoid floating dependnecy
7issues. This is not really an issue with RSS but is on previous releases.
8
9RP 2017/6/27
10Upstream-Status: Pending
11---
12 configure.ac | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index 0491090..4270c88 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -82,6 +82,11 @@ if test "x$GCC" = "xyes"; then
20 fi
21 fi
22
23+AC_ARG_ENABLE([tests],
24+ AS_HELP_STRING([--enable-tests],
25+ [enable tests (default=yes)]),,
26+ [enable_tests="yes"])
27+
28 dnl if glib is available we can enable the tests
29 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
30 [ glib_prefix="`$PKG_CONFIG --variable=prefix glib-2.0`"
31@@ -92,6 +97,11 @@ PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0],
32 build_tests="no"
33 ]
34 )
35+if test "x$enable_tests" != "xyes"; then
36+ gtk_doc_use_libtool="no"
37+ build_tests="no"
38+fi
39+
40 AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL" -a x$gtk_doc_use_libtool = xyes )
41 dnl this enables the rule in test/Makefile.am
42 AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
deleted file mode 100644
index 90207d6c12..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From fa5e31e02b9d3c6c5ec3cdc1f34dd6c179520fd0 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
6In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir.
7
8However, if some of this content is regenerated at configure time this can happen:
9
101) configure writes new build/version.xml
112) make compile copies content, including the tarball's src/version.xml
12 to build/version.xml, and generates gtk-doc.
133) make install notices build/version.xml is older than configure.status,
14 so regenerates gtk-doc.
15
16gtk-doc generation is a slow process at the best of times, so doing it twice isn't good.
17
18Solve this by changing cp --force to cp --no-clobber, so setup-build only copies
19files which don't already exist.
20
21Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571]
22Signed-off-by: Ross Burton <ross.burton@intel.com>
23---
24 buildsystems/autotools/gtk-doc.make | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make
28index fb2e7e2..4f6fe2b 100644
29--- a/buildsystems/autotools/gtk-doc.make
30+++ b/buildsystems/autotools/gtk-doc.make
31@@ -112,7 +112,7 @@ setup-build.stamp:
32 destdir=`dirname $(abs_builddir)/$$file`; \
33 test -d "$$destdir" || mkdir -p "$$destdir"; \
34 test -f $(abs_srcdir)/$$file && \
35- cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
36+ cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
37 done; \
38 fi; \
39 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
deleted file mode 100644
index 1b5c190f56..0000000000
--- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From c11fba9bcb8d55568067e626bd959841c05081e5 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] Use native pkg-config when looking for gtk-doc.
5
6Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8---
9 buildsystems/autotools/gtk-doc.m4 | 7 ++++++-
10 1 file changed, 6 insertions(+), 1 deletion(-)
11
12diff --git a/buildsystems/autotools/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
13index 2d12f01..e5afc3f 100644
14--- a/buildsystems/autotools/gtk-doc.m4
15+++ b/buildsystems/autotools/gtk-doc.m4
16@@ -25,7 +25,7 @@
17 # Macro appear in them. The GNU General Public License (GPL) does govern
18 # all other use of the material that constitutes the Autoconf Macro.
19
20-# serial 2
21+# serial 2.1
22
23 dnl Usage:
24 dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
25@@ -35,11 +35,16 @@ AC_DEFUN([GTK_DOC_CHECK],
26 AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
27 AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
28
29+ gtkdoc_pkgconfig_save=$PKG_CONFIG
30+ PKG_CONFIG=pkg-config-native
31+
32 ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
33 AC_MSG_CHECKING([for gtk-doc])
34 PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
35 AC_MSG_RESULT($have_gtk_doc)
36
37+ PKG_CONFIG=$gtkdoc_pkgconfig_save
38+
39 if test "$have_gtk_doc" = "no"; then
40 AC_MSG_WARN([
41 You will not be able to create source packages with 'make dist'
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb
deleted file mode 100644
index 693ae427e0..0000000000
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.34.0.bb
+++ /dev/null
@@ -1,64 +0,0 @@
1SUMMARY = "Documentation generator for glib-based software"
2DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \
3 from glib-based software and produce a set of html documentation files from them"
4HOMEPAGE = "https://www.gtk.org/docs/"
5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7
8GNOMEBASEBUILDCLASS = "autotools"
9inherit gnomebase
10
11# Configure the scripts correctly (and build their dependencies) only if they are actually
12# going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball.
13PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "working-scripts", "", d)}"
14
15# This will cause target gtk-doc to hardcode paths of native dependencies
16# into its scripts. This means that target gtk-doc package is broken;
17# hopefully no one minds because its scripts are not used for anything during build
18# and shouldn't be used on targets.
19PACKAGECONFIG[working-scripts] = ",,libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets python3-pygments"
20PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
21
22CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc"
23
24SRC_URI[archive.sha256sum] = "b20b72b32a80bc18c7f975c9d4c16460c2276566a0b50f87d6852dff3aa7861c"
25SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
26 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
27 file://conditionaltests.patch \
28 file://no-clobber.patch \
29 "
30SRC_URI:append:class-native = " file://pkg-config-native.patch"
31
32BBCLASSEXTEND = "native nativesdk"
33
34# Do not check for XML catalogs when building because that
35# information is not used for anything during build. Recipe
36# dependencies make sure we have all the right bits.
37do_configure:prepend() {
38 sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac
39}
40
41do_install:append () {
42 # configure values for python3 and pkg-config encoded in scripts
43 for fn in ${bindir}/gtkdoc-depscan \
44 ${bindir}/gtkdoc-mkhtml2 \
45 ${datadir}/gtk-doc/python/gtkdoc/config_data.py \
46 ${datadir}/gtk-doc/python/gtkdoc/config.py; do
47 sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \
48 -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \
49 -e '1s|^#!.*|#!/usr/bin/env python3|' \
50 -i ${D}$fn
51 done
52}
53
54FILES:${PN} += "${datadir}/sgml"
55FILES:${PN}-doc = ""
56
57SYSROOT_PREPROCESS_FUNCS:append:class-native = " gtkdoc_makefiles_sysroot_preprocess"
58gtkdoc_makefiles_sysroot_preprocess() {
59 # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
60 # instead of libtool wrapper or running them directly
61 sed -i \
62 -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
63 ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make
64}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-18 18:49:00 +0000