[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/, net-p2p/amule/

[Joonas Niilola]

commit:     2912503476a06505e0575648bdc85e1238ed17fd
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Feb  3 07:56:57 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 13:17:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29125034

net-p2p/amule: fix build with binutils-2.34

Closes: https://bugs.gentoo.org/707884
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/amule/amule-2.3.2-r4.ebuild                |  1 +
 ...le-2.3.2-Fixed-compilation-with-newer-bfd.patch | 33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/net-p2p/amule/amule-2.3.2-r4.ebuild b/net-p2p/amule/amule-2.3.2-r4.ebuild
index 8199a8471f0..eee88909130 100644
--- a/net-p2p/amule/amule-2.3.2-r4.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r4.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.8.patch"
 	"${FILESDIR}/${PN}-2.3.2-libupnp-1.6.patch"
+	"${FILESDIR}/${PN}-2.3.2-Fixed-compilation-with-newer-bfd.patch"
 )
 
 pkg_setup() {

diff --git a/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
new file mode 100644
index 00000000000..3ef8a21fa45
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-Fixed-compilation-with-newer-bfd.patch
@@ -0,0 +1,33 @@
+From c0c28234a40b1b575ce51cdfe5ffa5dac3a7494c Mon Sep 17 00:00:00 2001
+From: Werner Mahr <werner@×××××××××××××××.de>
+Date: Fri, 31 Jan 2020 17:55:24 +0100
+Subject: [PATCH] Fixed compilation with newer bfd. Fixes: #174
+
+---
+ src/libs/common/MuleDebug.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp
+index 5d8d75890..0ebf2ab07 100644
+--- a/src/libs/common/MuleDebug.cpp
++++ b/src/libs/common/MuleDebug.cpp
+@@ -268,14 +268,14 @@ void get_file_line_info(bfd *abfd, asection *section, void* _address)
+ 		return;
+ 	}
+ 
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
++	bfd_vma vma = section->vma;
+ 
+ 	unsigned long address = (unsigned long)_address;
+ 	if (address < vma) {
+ 		return;
+ 	}
+ 
+-	bfd_size_type size = bfd_section_size(abfd, section);
++	bfd_size_type size = section->size;
+ 	if (address > (vma + size)) {
+ 		return;
+ 	}
+-- 
+2.24.1
+