[mldonkey] gcc47 patch.
Jon Ciesla
limb at fedoraproject.org
Wed Feb 15 17:09:23 UTC 2012
commit 3a7acfe10c3c835a2b2e1a5c162ab331bf035ddd
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Feb 15 11:09:08 2012 -0600
gcc47 patch.
mldonkey-3.0.3-gcc47.patch | 31 +++++++++++++++++++++++++++++++
mldonkey.spec | 4 ++++
2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/mldonkey-3.0.3-gcc47.patch b/mldonkey-3.0.3-gcc47.patch
new file mode 100644
index 0000000..c9863b7
--- /dev/null
+++ b/mldonkey-3.0.3-gcc47.patch
@@ -0,0 +1,31 @@
+--- mldonkey-3.0.3.orig/src/utils/lib/CryptoPP.cc 2008-07-29 12:26:38.000000000 -0500
++++ mldonkey-3.0.3/src/utils/lib/CryptoPP.cc 2012-02-15 10:11:21.944760350 -0600
+@@ -5439,7 +5439,7 @@
+ 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;
+--- mldonkey-3.0.3.orig/src/utils/lib/CryptoPP.h 2007-12-13 12:06:56.000000000 -0600
++++ mldonkey-3.0.3/src/utils/lib/CryptoPP.h 2012-02-15 10:11:55.981137572 -0600
+@@ -2603,7 +2603,7 @@
+
+ pointer allocate(size_type n, const void * = NULL)
+ {
+- CheckSize(n);
++ this->CheckSize(n);
+ if (n == 0)
+ return NULL;
+ return new T[n];
+@@ -5582,7 +5582,7 @@
+ {
+ 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/mldonkey.spec b/mldonkey.spec
index 1aded8d..b138261 100644
--- a/mldonkey.spec
+++ b/mldonkey.spec
@@ -11,6 +11,7 @@ Source11: mldonkey.logrotate
Source12: mldonkey.service
#Patch1: mldonkey-0001-Init-script-enhancements.patch
Patch2: mldonkey-0002-Fix-DSO-linking.patch
+Patch3: mldonkey-3.0.3-gcc47.patch
URL: http://mldonkey.sourceforge.net
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -151,6 +152,7 @@ You need to edit %{_sysconfdir}/sysconfig/mldonkey_submit
#%patch1 -p1 -b .fedora
%if 0%{?fedora}
%patch2 -p1 -b .DSO_linking
+%patch3 -p1 -b .gcc47
%endif
# Let's make rpmlint happy
sed -i 's|\r||g' distrib/ed2k_submit/README.MLdonkeySubmit
@@ -174,6 +176,7 @@ chmod 644 src/networks/fasttrack/fst_crypt_ml.c
%endif
--disable-gd
+
make depend
# Does not support parallel builds
make
@@ -393,6 +396,7 @@ fi
%changelog
* Wed Feb 15 2012 Jon Ciesla <limburgher at gmail.com> - 3.0.3-5
- Migrate to systemd, BZ 789784.
+- gcc47 patch.
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list