From beecc3d02f032b642b316299d3edac53887ac1d5 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:54:49 +0100 Subject: [PATCH] update to 5.1.22 [release 5.1.22-1mamba;Sun Jun 18 2017] --- VirtualBox-5.0.24-build-gsoap.patch | 11 ----------- VirtualBox-5.1.22-build-gsoap.patch | 11 +++++++++++ VirtualBox.spec | 19 ++++++++++++++----- 3 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 VirtualBox-5.0.24-build-gsoap.patch create mode 100644 VirtualBox-5.1.22-build-gsoap.patch diff --git a/VirtualBox-5.0.24-build-gsoap.patch b/VirtualBox-5.0.24-build-gsoap.patch deleted file mode 100644 index 267be96..0000000 --- a/VirtualBox-5.0.24-build-gsoap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/VBox/Main/webservice/Makefile.kmk 2013-11-21 19:00:46.812761628 +0100 -+++ b/src/VBox/Main/webservice/Makefile.kmk 2014-01-04 04:37:05.803599026 +0100 -@@ -683,7 +683,7 @@ - : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) - $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) - $(RM) -f $@ -- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) -+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) - $(APPEND) $@ done - - # copy the generated headers and stuff. This has to be a separate rule if we diff --git a/VirtualBox-5.1.22-build-gsoap.patch b/VirtualBox-5.1.22-build-gsoap.patch new file mode 100644 index 0000000..7643b24 --- /dev/null +++ b/VirtualBox-5.1.22-build-gsoap.patch @@ -0,0 +1,11 @@ +--- VirtualBox-5.1.22/src/VBox/Main/webservice/Makefile.kmk.orig 2017-06-19 10:29:53.521378379 +0200 ++++ VirtualBox-5.1.22/src/VBox/Main/webservice/Makefile.kmk 2017-06-19 10:30:17.469556522 +0200 +@@ -733,7 +733,7 @@ + $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@) + $(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT)) + $(RM) -f $@ +- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) ++ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT) + ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround. + $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" + $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp" diff --git a/VirtualBox.spec b/VirtualBox.spec index 2eda248..3713ee4 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -17,7 +17,7 @@ %endif Name: VirtualBox -Version: 5.1.8 +Version: 5.1.22 Release: 1mamba Summary: A general-purpose full virtualizer for x86 hardware Group: Graphical Desktop/Applications/Utilities @@ -40,7 +40,7 @@ Patch3: VirtualBox-4.2.16-vboxusb-permissions.patch Patch4: VirtualBox-4.3.12-gcc-4.9.0.patch Patch5: VirtualBox-4.3.26-vdfuse.patch Patch6: VirtualBox-5.0.4-x86-upstream-buildfixes.patch -Patch7: VirtualBox-5.0.24-build-gsoap.patch +Patch7: VirtualBox-5.1.22-build-gsoap.patch Patch8: VirtualBox-5.0.24-ogl-include-path.patch License: GPL ## AUTOBUILDREQ-BEGIN @@ -154,15 +154,16 @@ Obsoletes: kernelvboxvideo Kernel DRM driver for VirtualBox guest machines. %prep -%setup -q -a6 -D -T -:<< _EOF +%setup -q -a6 +#-D -T +#:<< _EOF #%patch1 -p1 #%patch2 -p1 #%patch4 -p1 #%patch3 -p1 %patch5 -p1 #%patch6 -p2 -#%patch7 -p1 +%patch7 -p1 %patch8 -p1 echo "\ @@ -215,6 +216,11 @@ export CXXFLAGS="%optflags" . ./env.sh +%ifarch x86_64 +export KERN_DIR=/usr/src/linux-mamba-x86_64 +%else +export KERN_DIR=/usr/src/linux-mamba +%endif kmk %{?_smp_mflags} CPPFLAGS="%{optflags} -fpermissive" # EB_LD=ld.bfd # || true @@ -661,6 +667,9 @@ fi %{_prefix}/src/vboxvideo-%{version}/* %changelog +* Sun Jun 18 2017 Silvan Calarco 5.1.22-1mamba +- update to 5.1.22 + * Wed Oct 19 2016 Automatic Build System 5.1.8-1mamba - automatic version update by autodist