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

[Felix Geyer]

The following commit has been merged in the master branch:
commit 18ea0ef54db5734c85f020876bcfae44be6fe727
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu May 3 15:47:40 2012 +0200

    Fix FTBFS with gcc 4.7 on i386.

diff --git a/debian/changelog b/debian/changelog
index d8a0ce3..0c8857f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.1.14-dfsg-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS with gcc 4.7 on i386.
+    - Add 37-fix-build-gcc47.patch
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 03 May 2012 15:15:38 +0200
+
 virtualbox (4.1.14-dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/37-fix-build-gcc47.patch b/debian/patches/37-fix-build-gcc47.patch
new file mode 100644
index 0000000..747479d
--- /dev/null
+++ b/debian/patches/37-fix-build-gcc47.patch
@@ -0,0 +1,23 @@
+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 45f7025..2716345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 32-disable-guest-version-check.patch
 35-libvdeplug-soname.patch
 36-fix-ftbfs-xserver-112.patch
+37-fix-build-gcc47.patch

-- 
virtualbox Debian packaging