[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.10-dfsg-1-6-g434d8c2

[Felix Geyer]

The following commit has been merged in the master branch:
commit 95703a687427cf1115988d31694b98e94709aa17
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 14 17:52:31 2013 +0200

    Revert "Allow building virtualbox with gcc 4.8."
    
    This reverts commit fba77532dfcb1a59f07c2f28496173ab6a8e0e42.

diff --git a/debian/changelog b/debian/changelog
index 35537c2..598f883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-virtualbox (4.2.10-dfsg-2) UNRELEASED; urgency=low
-
-  * Allow building virtualbox with gcc 4.8.
-    - Add 38-allow-gcc-4.8.patch, cherry-picked from upstream
-
- -- Felix Geyer <fgeyer at debian.org>  Wed, 22 May 2013 21:10:36 +0200
-
 virtualbox (4.2.10-dfsg-1) unstable; urgency=low
 
   * New upstream release. (Closes: #691148)
diff --git a/debian/patches/38-allow-gcc-4.8.patch b/debian/patches/38-allow-gcc-4.8.patch
deleted file mode 100644
index 0385c05..0000000
--- a/debian/patches/38-allow-gcc-4.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: configure/Config: allow gcc-4.8
-Origin: upstream, https://www.virtualbox.org/changeset/45450/vbox
-
---- a/Config.kmk
-+++ b/Config.kmk
-@@ -1480,7 +1480,7 @@ USES += dtrace
- #
- # Compiler optimization flags.
- #
--VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
-+VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
- VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
- ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
-  VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
-@@ -2255,6 +2255,12 @@ ifneq ($(KBUILD_TARGET),l4)
- 	$(QUIET)$(APPEND) '$@' ' endif'
- 	$(QUIET)$(APPEND) '$@' 'endif'
- endif
-+# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
-+	$(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
-+	$(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
-+	$(QUIET)$(APPEND) '$@' '  VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
-+	$(QUIET)$(APPEND) '$@' ' endif'
-+	$(QUIET)$(APPEND) '$@' 'endif'
- ifeq ($(KBUILD_TARGET),solaris)
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
- # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
---- a/configure
-+++ b/configure
-@@ -409,7 +409,7 @@ check_gcc()
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
-              -o $cc_maj -gt 4 ]; then
-         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-         fail really
diff --git a/debian/patches/series b/debian/patches/series
index 7f80d83..e29a2cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@
 35-libvdeplug-soname.patch
 36-python-multiarch.patch
 37-wheezy-kernel-drm.patch
-38-allow-gcc-4.8.patch

-- 
virtualbox Debian packaging