diff options
-rw-r--r-- | system/virtualbox/virtualbox-gsoap.patch | 40 | ||||
-rw-r--r-- | system/virtualbox/virtualbox.SlackBuild | 4 | ||||
-rw-r--r-- | system/virtualbox/virtualbox.info | 18 |
3 files changed, 52 insertions, 10 deletions
diff --git a/system/virtualbox/virtualbox-gsoap.patch b/system/virtualbox/virtualbox-gsoap.patch new file mode 100644 index 0000000000..f9336ca8dc --- /dev/null +++ b/system/virtualbox/virtualbox-gsoap.patch @@ -0,0 +1,40 @@ +diff -u -r VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-4.3.20/src/VBox/Main/webservice/Makefile.kmk +--- VirtualBox-4.3.20.orig/src/VBox/Main/webservice/Makefile.kmk 2014-11-21 16:22:38.000000000 +0100 ++++ VirtualBox-4.3.20/src/VBox/Main/webservice/Makefile.kmk 2014-12-10 20:46:37.462326942 +0100 +@@ -159,7 +159,6 @@ + RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT) + + PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml +-PATH_TARGET_SOAPDEMOHEADERS := $(VBOXWEB_OUT_DIR)/demo_headers + PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps + PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest + +@@ -512,8 +511,6 @@ + $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \ + $(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \ + $(PATH_TARGET_SOAPDEMOXML)/dummy_file \ +- $(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \ +- $(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \ + $(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \ + $(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file + +@@ -691,17 +688,14 @@ + # however we cannot as it is subject to caching. Let the shell do the globbing. + $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@) + $(RM) -f $@ +- $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS) ++ $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS) + ifdef VBOX_GSOAP_VERBOSE + $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/ + endif +- $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/ + $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/ + $(APPEND) $@ done + +-$(PATH_TARGET_SOAPDEMONSMAPS) \ +-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \ +-$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts ++$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts + + # soapcpp2 -2: generate SOAP 1.2 calls + # soapcpp2 -S: server-side code only diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index 24ccaccdb8..22f2c73adf 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=${VERSION:-4.3.18} +VERSION=${VERSION:-4.3.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -145,6 +145,8 @@ patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff # Patch taken from gentoo patch -p1 -i $CWD/virtualbox-4-makeself-check.patch +patch -p1 -i $CWD/virtualbox-gsoap.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info index a2f65a2e29..43c17565e6 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,14 +1,14 @@ PRGNAM="virtualbox" -VERSION="4.3.18" +VERSION="4.3.20" HOMEPAGE="http://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/4.3.18/VirtualBox-4.3.18.tar.bz2 \ - http://download.virtualbox.org/virtualbox/4.3.18/VBoxGuestAdditions_4.3.18.iso \ - http://download.virtualbox.org/virtualbox/4.3.18/UserManual.pdf \ - http://download.virtualbox.org/virtualbox/4.3.18/SDKRef.pdf" -MD5SUM="0e6e345a5bc4321bc5014258c6e9a5bb \ - c95841f30fa274708b4798c670fb10da \ - 525b65f8c30cc3af7ba82fc57f5206d4 \ - ca4a455bad0f2dea359f0dd61c225add" +DOWNLOAD="http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20.tar.bz2 \ + http://download.virtualbox.org/virtualbox/4.3.20/VBoxGuestAdditions_4.3.20.iso \ + http://download.virtualbox.org/virtualbox/4.3.20/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/4.3.20/SDKRef.pdf" +MD5SUM="cf3f25644aa0fae1029e8b362bd4375e \ + 4f6861ee0c584bcf6819cc76a2bd65ab \ + 08d9ad5f3dd7aebe79fd9fd67502ec0c \ + 406fa811914c4c71a1ce2c0a5d82d699" DOWNLOAD_x86_64="UNTESTED" MD5SUM_x86_64="" REQUIRES="acpica virtualbox-kernel" |