diff options
Diffstat (limited to 'meta/recipes-gnome/gtk-doc')
-rw-r--r-- | meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch | 24 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb (renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb) | 25 |
2 files changed, 39 insertions, 10 deletions
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 new file mode 100644 index 0000000000..f40124877c --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch | |||
@@ -0,0 +1,24 @@ | |||
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/gtk-doc_1.33.1.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 5f9fe0a91d..4fd5a6e925 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb | |||
@@ -2,9 +2,10 @@ SUMMARY = "Documentation generator for glib-based software" | |||
2 | DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ | 2 | DESCRIPTION = "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" | 3 | from glib-based software and produce a set of html documentation files from them" |
4 | HOMEPAGE = "https://www.gtk.org/docs/" | 4 | HOMEPAGE = "https://www.gtk.org/docs/" |
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPL-2.0-only" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
7 | 7 | ||
8 | GNOMEBASEBUILDCLASS = "autotools" | ||
8 | inherit gnomebase | 9 | inherit gnomebase |
9 | 10 | ||
10 | # Configure the scripts correctly (and build their dependencies) only if they are actually | 11 | # Configure the scripts correctly (and build their dependencies) only if they are actually |
@@ -15,42 +16,46 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", | |||
15 | # into its scripts. This means that target gtk-doc package is broken; | 16 | # 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 | 17 | # hopefully no one minds because its scripts are not used for anything during build |
17 | # and shouldn't be used on targets. | 18 | # and shouldn't be used on targets. |
18 | PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" | 19 | PACKAGECONFIG[working-scripts] = ",,libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets python3-pygments" |
19 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" | 20 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" |
20 | 21 | ||
21 | SRC_URI[archive.sha256sum] = "a5cfed2a0b73a09b796fff80ad6d8f040ab2b2655bdc941ac207ffe6d9c10f10" | 22 | CACHED_CONFIGUREVARS += "ac_cv_path_XSLTPROC=xsltproc" |
23 | |||
24 | SRC_URI[archive.sha256sum] = "cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" | ||
22 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ | 25 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ |
23 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ | 26 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ |
24 | file://conditionaltests.patch \ | 27 | file://conditionaltests.patch \ |
25 | file://no-clobber.patch \ | 28 | file://no-clobber.patch \ |
29 | file://0001-Don-t-use-docdir-from-environment.patch \ | ||
26 | " | 30 | " |
27 | SRC_URI_append_class-native = " file://pkg-config-native.patch" | 31 | SRC_URI:append:class-native = " file://pkg-config-native.patch" |
28 | 32 | ||
29 | BBCLASSEXTEND = "native nativesdk" | 33 | BBCLASSEXTEND = "native nativesdk" |
30 | 34 | ||
31 | # Do not check for XML catalogs when building because that | 35 | # Do not check for XML catalogs when building because that |
32 | # information is not used for anything during build. Recipe | 36 | # information is not used for anything during build. Recipe |
33 | # dependencies make sure we have all the right bits. | 37 | # dependencies make sure we have all the right bits. |
34 | do_configure_prepend() { | 38 | do_configure:prepend() { |
35 | sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac | 39 | sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac |
36 | } | 40 | } |
37 | 41 | ||
38 | do_install_append () { | 42 | do_install:append () { |
39 | # configure values for python3 and pkg-config encoded in scripts | 43 | # configure values for python3 and pkg-config encoded in scripts |
40 | for fn in ${bindir}/gtkdoc-depscan \ | 44 | for fn in ${bindir}/gtkdoc-depscan \ |
41 | ${bindir}/gtkdoc-mkhtml2 \ | 45 | ${bindir}/gtkdoc-mkhtml2 \ |
46 | ${datadir}/gtk-doc/python/gtkdoc/config_data.py \ | ||
42 | ${datadir}/gtk-doc/python/gtkdoc/config.py; do | 47 | ${datadir}/gtk-doc/python/gtkdoc/config.py; do |
43 | sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ | 48 | sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ |
44 | -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ | 49 | -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ |
50 | -e '1s|^#!.*|#!/usr/bin/env python3|' \ | ||
45 | -i ${D}$fn | 51 | -i ${D}$fn |
46 | done | 52 | done |
47 | } | 53 | } |
48 | 54 | ||
49 | FILES_${PN} += "${datadir}/sgml" | 55 | FILES:${PN} += "${datadir}/sgml" |
50 | FILES_${PN}-dev += "${libdir}/cmake" | 56 | FILES:${PN}-doc = "" |
51 | FILES_${PN}-doc = "" | ||
52 | 57 | ||
53 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " gtkdoc_makefiles_sysroot_preprocess" | 58 | SYSROOT_PREPROCESS_FUNCS:append:class-native = " gtkdoc_makefiles_sysroot_preprocess" |
54 | gtkdoc_makefiles_sysroot_preprocess() { | 59 | gtkdoc_makefiles_sysroot_preprocess() { |
55 | # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries | 60 | # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries |
56 | # instead of libtool wrapper or running them directly | 61 | # instead of libtool wrapper or running them directly |