From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 23 Mar 2020 17:04:23 +0000 (+0100)
Subject: - fix building with binutils 2.34
X-Git-Tag: auto/th/aMule-2.3.2-10
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=feb31138de52da0d2413b9c7bad43f7f14147077;p=packages%2FaMule.git

- fix building with binutils 2.34
- rel 10
---

diff --git a/aMule.spec b/aMule.spec
index ccbebb5..4e92fdb 100644
--- a/aMule.spec
+++ b/aMule.spec
@@ -5,7 +5,7 @@ Summary:	Unix port of eMule client
 Summary(pl.UTF-8):	Uniksowy port klienta eMule
 Name:		aMule
 Version:	2.3.2
-Release:	9
+Release:	10
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/amule/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-cas-datadir.patch
 Patch2:		%{name}-ac.patch
 Patch3:		%{name}-cryptopp.patch
+Patch4:		binutils-2.34.patch
 URL:		http://www.amule.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf >= 2.59
@@ -96,6 +97,7 @@ Narzędzie do generownia statystyk aMule.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I m4
diff --git a/binutils-2.34.patch b/binutils-2.34.patch
new file mode 100644
index 0000000..8519c71
--- /dev/null
+++ b/binutils-2.34.patch
@@ -0,0 +1,19 @@
+--- aMule-2.3.2/src/libs/common/MuleDebug.cpp.orig	2016-09-16 09:55:07.000000000 +0200
++++ aMule-2.3.2/src/libs/common/MuleDebug.cpp	2020-03-23 18:00:45.013375544 +0100
+@@ -268,14 +268,14 @@
+ 		return;
+ 	}
+ 
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
++	bfd_vma vma = bfd_section_vma(section);
+ 
+ 	unsigned long address = (unsigned long)_address;
+ 	if (address < vma) {
+ 		return;
+ 	}
+ 
+-	bfd_size_type size = bfd_section_size(abfd, section);
++	bfd_size_type size = bfd_section_size(section);
+ 	if (address > (vma + size)) {
+ 		return;
+ 	}