summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/gtk-doc/files/0001-Don-t-use-docdir-from-environment.patch24
-rw-r--r--meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb1
2 files changed, 25 insertions, 0 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 @@
1From 72dfeec0e49478b0bfb471c4155044391bad8e6c Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Fri, 8 Dec 2023 10:35:25 +0000
4Subject: [PATCH] Don't use docdir from environment
5
6Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/73]
7Signed-off-by: Ross Burton <ross.burton@arm.com>
8---
9 buildsystems/autotools/gtkdocize.in | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in
13index 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.2.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb
index f2f37610f9..4fd5a6e925 100644
--- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb
+++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb
@@ -26,6 +26,7 @@ SRC_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 \ 26 file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
27 file://conditionaltests.patch \ 27 file://conditionaltests.patch \
28 file://no-clobber.patch \ 28 file://no-clobber.patch \
29 file://0001-Don-t-use-docdir-from-environment.patch \
29 " 30 "
30SRC_URI:append:class-native = " file://pkg-config-native.patch" 31SRC_URI:append:class-native = " file://pkg-config-native.patch"
31 32