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

[Felix Geyer]

The following commit has been merged in the master branch:
commit 5491d7c6c3448db2bdf15b2daf3c69a75f918c53
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue May 29 09:51:01 2012 +0200

    Drop 37-fix-build-gcc47.patch, fixed upstream.

diff --git a/debian/changelog b/debian/changelog
index 81f3a91..c382422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 virtualbox (4.1.16-dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop 37-fix-build-gcc47.patch, fixed upstream.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 28 May 2012 18:01:20 +0200
 
diff --git a/debian/patches/37-fix-build-gcc47.patch b/debian/patches/37-fix-build-gcc47.patch
deleted file mode 100644
index 747479d..0000000
--- a/debian/patches/37-fix-build-gcc47.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix FTBFS with gcc 4.7 on i386.
-Origin: upstream, https://www.virtualbox.org/changeset/40420/vbox
-
---- a/src/libs/xpcom18a4/xpcom/io/nsFastLoadFile.h
-+++ b/src/libs/xpcom18a4/xpcom/io/nsFastLoadFile.h
-@@ -294,6 +294,6 @@
-     // not call through our overridden Read method -- it calls directly into
-     // the underlying input stream.
--    NS_IMETHODIMP ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
--                               PRUint32 aCount, PRUint32 *aResult);
-+    NS_IMETHOD ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
-+                            PRUint32 aCount, PRUint32 *aResult);
- 
-     nsresult ReadHeader(nsFastLoadHeader *aHeader);
---- a/src/VBox/Runtime/generic/critsect-generic.cpp
-+++ b/src/VBox/Runtime/generic/critsect-generic.cpp
-@@ -455,5 +455,5 @@
- 
- 
--RTDECL(int) RTCritSectEnterMultipleDebug(size_t cCritSects, PRTCRITSECT *papCritSects, RTUINTPTR uId, RT_SRC_POS_DECL)
-+RTDECL(int) RTCritSectEnterMultipleDebug(size_t cCritSects, PRTCRITSECT *papCritSects, RTHCUINTPTR uId, RT_SRC_POS_DECL)
- {
-     RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
diff --git a/debian/patches/series b/debian/patches/series
index 2716345..45f7025 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-ftbfs-xserver-112.patch
-37-fix-build-gcc47.patch

-- 
virtualbox Debian packaging