[arch-commits] Commit in virtualbox/trunk (3 files)

[Christian Hesse]

    Date: Friday, August 19, 2016 @ 13:56:20
  Author: eworm
Revision: 187063

prepare for version 5.1.4

Modified:
  virtualbox/trunk/005-gsoap-build.patch
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/008-vbox-guest-linux-4-7.patch

--------------------------------+
 005-gsoap-build.patch          |   12 ++++++------
 008-vbox-guest-linux-4-7.patch |   15 ---------------
 PKGBUILD                       |   11 +++++------
 3 files changed, 11 insertions(+), 27 deletions(-)

Modified: 005-gsoap-build.patch
===================================================================
--- 005-gsoap-build.patch	2016-08-19 13:53:10 UTC (rev 187062)
+++ 005-gsoap-build.patch	2016-08-19 13:56:20 UTC (rev 187063)
@@ -1,11 +1,11 @@
 --- 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 $$@)
++++ b/src/VBox/Main/webservice/Makefile.kmk	2016-08-18 15:16:05.803599026 +0100
+@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
+ 		$(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
+ 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"

Deleted: 008-vbox-guest-linux-4-7.patch
===================================================================
--- 008-vbox-guest-linux-4-7.patch	2016-08-19 13:53:10 UTC (rev 187062)
+++ 008-vbox-guest-linux-4-7.patch	2016-08-19 13:56:20 UTC (rev 187063)
@@ -1,15 +0,0 @@
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bcce2d2..40e09d7 100644
---- a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -274,6 +274,10 @@ struct ttm_bo_driver vbox_bo_driver = {
-     .verify_access = vbox_bo_verify_access,
-     .io_mem_reserve = &vbox_ttm_io_mem_reserve,
-     .io_mem_free = &vbox_ttm_io_mem_free,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+    .lru_tail = &ttm_bo_default_lru_tail,
-+    .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
-+#endif
- };
- 
- int vbox_mm_init(struct vbox_private *vbox)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-19 13:53:10 UTC (rev 187062)
+++ PKGBUILD	2016-08-19 13:56:20 UTC (rev 187063)
@@ -10,8 +10,8 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=5.1.2
-pkgrel=3
+pkgver=5.1.4
+pkgrel=0
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -69,9 +69,8 @@
         '005-gsoap-build.patch'
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
-        '008-vbox-guest-linux-4-7.patch'
         )
-md5sums=('aff1647170dd92914cddfbd0254b9773'
+md5sums=('e25a6a1f3c113c373dc0433f9c2526f3'
          'a19774e8c56f2c4d12c528992525c444'
          '331f69783ea9d4e762f7103954c500a3'
          '984412a63aa9c07ddc3cfd970381d5df'
@@ -85,10 +84,10 @@
          '0bab94ff2f4835fd907f89eb23ebbe21'
          '9be7e2703afeee1fca9368bd8750e710'
          '9e49bbaa2192b141c27ee43cef8cbab7'
-         'ecfd13297d7753ebe7b8763ca5b792d9'
+         'e8a0b47e61ddcffdeed71086585a1ef3'
          'd82a6f19be739341ed7f1cf4ee8070ca'
          '188ea65918309f737ce28216c2b07c3b'
-         '2b0460e9378f45cc40b3cae14d64439e')
+         )
 
 prepare() {
     cd "VirtualBox-$pkgver"