summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Munteanu <ceamac@gentoo.org>2024-09-14 19:06:51 +0300
committerViorel Munteanu <ceamac@gentoo.org>2024-09-14 19:06:51 +0300
commitfa605defe5e2aa575a2f47e2dc9985a2326a1c2e (patch)
treedc1f7278789a9e541452c0a1baeee27b17f56a4b
parentAdd patch to fix linking with mold (diff)
downloadvirtualbox-patches-7.1.0.tar.gz
virtualbox-patches-7.1.0.tar.bz2
virtualbox-patches-7.1.0.zip
Add patch to use system dita-ot to build the docsv7.1.0branch-7.1
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
-rw-r--r--patches/028_virtualbox-7.1.0-use-system-dita-ot.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch b/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch
new file mode 100644
index 0000000..e693543
--- /dev/null
+++ b/patches/028_virtualbox-7.1.0-use-system-dita-ot.patch
@@ -0,0 +1,31 @@
+Starting with branch 7.1, upstream use dita-ot to build the manual.
+
+They seem to use an unbundled copy.
+
+Patch the Makefile to use dita-ot installed in the system.
+
+--- a/doc/manual/Makefile.kmk
++++ b/doc/manual/Makefile.kmk
+@@ -135,21 +135,9 @@
+ # @param 2 Parameters for the invoker.
+ #
+ VBOX_DITA_RUN_DOST = $(REDIRECT_EXT) \
+- -E 'ANT_HOME=$(VBOX_DITA_OT_PATH)' \
+- -E 'DITA_DIR=$(VBOX_DITA_OT_PATH)' \
+- -E 'JAVA_HOME=$(VBOX_JAVA17PLUS_HOME)' \
+- -E 'CLASSPATH=$(VBOX_DITA_CLASSPATH)' \
+ $1 \
+ -- \
+- "$(VBOX_JAVA17PLUS_HOME)/bin/java" \
+- "-Djava.awt.headless=true" \
+- "-Dsun.io.useCanonCaches=true" \
+- "-Dant.home=$(VBOX_DITA_OT_PATH)" \
+- "-Ddita.dir=$(VBOX_DITA_OT_PATH)" \
+- org.apache.tools.ant.launch.Launcher \
+- -cp "$(VBOX_DITA_CLASSPATH)" \
+- -buildfile "$(VBOX_DITA_OT_PATH)/build.xml" \
+- -main "org.dita.dost.invoker.Main" \
++ dita \
+ --args.grammar.cache=yes \
+ --verbose \
+ $(if-expr defined(VBOX_DITA_DEBUG),"--clean.temp=no" "--debug",) \