[Pkg-virtualbox-commits] [virtualbox] 03/04: Update patches

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 4fe35151d7f8b91057b0c315e23caeac52c6b98c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Sep 13 15:32:09 2016 +0200

    Update patches
---
 debian/patches/02-gsoap-build-fix.patch         |  2 +-
 debian/patches/16-no-update.patch               |  2 +-
 debian/patches/27-hide-host-cache-warning.patch |  2 +-
 debian/patches/fix-gcc-check.patch              | 13 -------------
 debian/patches/series                           |  1 -
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index 2cc4e6b..5afb949 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
 ===================================================================
 --- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:32:51.211124975 -0500
 +++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk	2013-12-02 12:36:04.531133954 -0500
-@@ -724,7 +724,7 @@
+@@ -726,7 +726,7 @@
  		$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
  	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
  	$(RM) -f $@
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index ac2be6b..12dd274 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 +++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -447,6 +447,8 @@
+@@ -468,6 +468,8 @@
  
  void UIUpdateManager::sltForceCheck()
  {
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 8aa644b..346f37d 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
 ===================================================================
 --- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.415740583 +0200
 +++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp	2015-04-02 15:46:54.411740580 +0200
-@@ -4102,34 +4102,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
+@@ -4115,34 +4115,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
                      if (   enmFsTypeFile == RTFSTYPE_EXT4
                          || enmFsTypeFile == RTFSTYPE_XFS)
                      {
diff --git a/debian/patches/fix-gcc-check.patch b/debian/patches/fix-gcc-check.patch
deleted file mode 100644
index 7325043..0000000
--- a/debian/patches/fix-gcc-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
---- virtualbox-5.1.4-dfsg.orig/configure
-+++ virtualbox-5.1.4-dfsg/configure
-@@ -441,7 +441,7 @@ check_gcc()
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
-              -o \( $cc_maj -eq 5 -a $cc_min -gt 9 \) \
--             -o \( $cc_maj -eq 6 -a $cc_min -gt 1 \) \
-+             -o \( $cc_maj -eq 6 -a $cc_min -gt 9 \) \
-              -o $cc_maj -gt 6 ]; then
-         log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x, gcc 5.x or gcc 6.x"
-         fail really
diff --git a/debian/patches/series b/debian/patches/series
index ebed467..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
-fix-gcc-check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git