diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 03:01:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 03:01:54 +0000 |
| commit | 0494175483c2d82f445ddca9cadb6ee6338e9f9c (patch) | |
| tree | 336364dc245983722e34439ece449564e77ca286 /debian/patches/java11-upstream.patch | |
| parent | Adding upstream version 6.0.4-dfsg. (diff) | |
| download | virtualbox-debian.tar.xz virtualbox-debian.zip | |
Adding debian version 6.0.4-dfsg-7.debian/6.0.4-dfsg-7debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/java11-upstream.patch')
| -rw-r--r-- | debian/patches/java11-upstream.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/java11-upstream.patch b/debian/patches/java11-upstream.patch new file mode 100644 index 00000000..8966c9ae --- /dev/null +++ b/debian/patches/java11-upstream.patch @@ -0,0 +1,50 @@ +--- virtualbox-6.0.4-dfsg.orig/Config.kmk ++++ virtualbox-6.0.4-dfsg/Config.kmk +@@ -2768,7 +2768,8 @@ else # !darwin + VBOX_JAVAH = "$(VBOX_JAVA_HOME)/bin/javah$(HOSTSUFF_EXE)" + VBOX_JAR = "$(VBOX_JAVA_HOME)/bin/jar$(HOSTSUFF_EXE)" + VBOX_JAVADOC = "$(VBOX_JAVA_HOME)/bin/javadoc$(HOSTSUFF_EXE)" +- VBOX_WSIMPORT = "$(VBOX_JAVA_HOME)/bin/wsimport$(HOSTSUFF_EXE)" ++ # With Java 11 wsimport was removed, usually part of a separate install now. ++ VBOX_WSIMPORT = $(firstword $(wildcard $(VBOX_JAVA_HOME)/bin/wsimport$(HOSTSUFF_EXE)) wsimport$(HOSTSUFF_EXE)) + # correct for targets we care about + VBOX_MD_OS = $(KBUILD_TARGET) + VBOX_JAVA_INC = \ +@@ -7744,10 +7745,15 @@ else + endif + + # Java compiler options, needs some version checking. +-if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 10900 ++if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 110000 ++ VBOX_JAVA_WS_PATH ?= /usr/share/java ++ VBOX_JAVA_WS_EXTRA_JARS ?= $(VBOX_JAVA_WS_PATH)/jws-api.jar$(VBOX_SEP)$(VBOX_JAVA_WS_PATH)/jaxb-api.jar$(VBOX_SEP)$(VBOX_JAVA_WS_PATH)/jaxws-api.jar ++else if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 10900 + VBOX_JAVA_WS_OPTS ?= --add-modules java.xml.ws + endif +-if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 100000 ++if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 110000 ++ VBOX_JAVAC_OPTS = -encoding UTF-8 -source 9 -target 9 -Xlint:unchecked ++else if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 100000 + VBOX_JAVAC_OPTS = -encoding UTF-8 -source 6 -target 6 -Xlint:unchecked + else + VBOX_JAVAC_OPTS = -encoding UTF-8 -source 1.5 -target 1.5 -Xlint:unchecked +--- virtualbox-6.0.4-dfsg.orig/src/VBox/Main/webservice/Makefile.kmk ++++ virtualbox-6.0.4-dfsg/src/VBox/Main/webservice/Makefile.kmk +@@ -480,7 +480,7 @@ $$(VBOX_JWS_JAR): $(VBOX_JWS_GEN)/jwsglu + $(call MSG_L1,Compiling bridge code) + $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) $(VBOX_JAVA_WS_OPTS) \ + @$(VBOX_JWS_GEN)/jwsglue.list \ +- -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST) ++ -d $(VBOX_JWS_JDEST) -classpath $(VBOX_JWS_JDEST)$(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS) + $(QUIET)$(SED) -e "s/vboxweb.wsdl/vboxweb$(VBOX_API_SUFFIX).wsdl/" < $(VBOXWEBSERVICE_WSDL) > $(VBOX_JWS_JDEST)/vboxwebService$(VBOX_API_SUFFIX).wsdl + $(QUIET)$(CP) -f $(VBOXWEB_WSDL) $(VBOX_JWS_JDEST)/vboxweb$(VBOX_API_SUFFIX).wsdl + $(call MSG_LINK,$(notdir $@),$@) +@@ -503,7 +503,7 @@ $$(VBOX_JWSDOC_JAR): $(VBOX_JWS_GEN)/jws + $(call MSG_L1,Generating javadoc html documentation) + $(VBOX_JAVADOC) $(VBOX_JAVADOC_OPTS) $(VBOX_JAVA_WS_OPTS) -quiet \ + -sourcepath $(VBOX_JWS_GEN)/java org.virtualbox$(VBOX_API_SUFFIX) \ +- -d $(VBOX_JWSDOC_JDEST) ++ -d $(VBOX_JWSDOC_JDEST) -classpath $(VBOX_SEP)$(VBOX_JAVA_WS_EXTRA_JARS) + $(call MSG_LINK,$(notdir $@),$@) + $(VBOX_JAR) cf $@ -C $(VBOX_JWSDOC_JDEST) . + |