[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.1.0-3-2-g63d4ecd

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4b98dcc71bfb093787f227233f0384df8709bb14
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 5 07:40:27 2012 +0200

    Fix FTBFS with GCC 4.7 (Closes: #667283)

diff --git a/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch b/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch
new file mode 100644
index 0000000..410b40a
--- /dev/null
+++ b/debian/patches/0004-Fix-FTBFS-with-GCC-4.7.patch
@@ -0,0 +1,49 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 5 Apr 2012 07:35:39 +0200
+Subject: Fix FTBFS with GCC 4.7
+
+Author: spiralvoice
+Origin: http://savannah.nongnu.org/patch/?7755
+Bug: http://savannah.nongnu.org/bugs/?36078
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667283
+---
+ src/utils/lib/CryptoPP.cc |    2 +-
+ src/utils/lib/CryptoPP.h  |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
+index 6b12b0a..be0b04a 100644
+--- a/src/utils/lib/CryptoPP.cc
++++ b/src/utils/lib/CryptoPP.cc
+@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, co
+ 	Element g[3]={b, a};
+ 	unsigned int i0=0, i1=1, i2=2;
+ 
+-	while (!Equal(g[i1], this->Identity()))
++	while (!this->Equal(g[i1], this->Identity()))
+ 	{
+ 		g[i2] = Mod(g[i0], g[i1]);
+ 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+index af1621b..900e711 100644
+--- a/src/utils/lib/CryptoPP.h
++++ b/src/utils/lib/CryptoPP.h
+@@ -2633,7 +2633,7 @@ public:
+ 
+ 	pointer allocate(size_type n, const void * = NULL)
+ 	{
+-		CheckSize(n);
++		this->CheckSize(n);
+ 		if (n == 0)
+ 			return NULL;
+ 		return new T[n];
+@@ -5612,7 +5612,7 @@ template <class T, class B, class BASE> void IteratedHashBase2<T, B, BASE>::Trun
+ {
+ 	this->ThrowIfInvalidTruncatedSize(size);
+ 
+-	PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
++	this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
+ 	CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
+ 
+ 	this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index efbcb3b..7016920 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-usr-bin-see-as-default-previewer.patch
 0002-Remove-bashisms.patch
 0003-Fix-tiger-tree-corruption.patch
+0004-Fix-FTBFS-with-GCC-4.7.patch

-- 
mldonkey packaging