wok-6.x rev 24770

amule: modified MuleDebug.cpp for libbfd-2.37
author Hans-G?nter Theisgen
date Sat Mar 19 15:22:11 2022 +0100 (2022-03-19)
parents 232c9b0ea779
children 5105b399919c
files amule/receipt amule/stuff/patches/MuleDebug.cpp-2.3.2
line diff
     1.1 --- a/amule/receipt	Fri Mar 18 17:48:15 2022 +0100
     1.2 +++ b/amule/receipt	Sat Mar 19 15:22:11 2022 +0100
     1.3 @@ -28,26 +28,27 @@
     1.4  compile_rules()
     1.5  {
     1.6  	patch -p1 < $stuff/libupnp1.8.patch || exit 1
     1.7 +	patch --strip=0 --input=$stuff/patches/MuleDebug.cpp-2.3.2 &&
     1.8  
     1.9  	# What works for imule (see https://aur.archlinux.org/packages/imule)
    1.10  	# might work for amule also:
    1.11  	sed -i 's/pubkey.DEREncode(asink);/pubkey.AccessMaterial().Save(asink);/g' \
    1.12  		src/ClientCreditsList.cpp
    1.13  
    1.14 -	./configure \
    1.15 -		--prefix=/usr \
    1.16 +	./configure		\
    1.17 +		--prefix=/usr	\
    1.18  		$CONFIGURE_ARGS &&
    1.19  	make $MAKEFLAGS &&
    1.20 -	make DESTDIR=$DESTDIR install
    1.21 -	./configure \
    1.22 -		--prefix=/usr \
    1.23 -		--disable-monolithic \
    1.24 -		--enable-amule-daemon \
    1.25 -		--enable-amulecmd \
    1.26 -		--enable-webserver \
    1.27 +	make install DESTDIR=$DESTDIR
    1.28 +	./configure			\
    1.29 +		--prefix=/usr		\
    1.30 +		--disable-monolithic	\
    1.31 +		--enable-amule-daemon	\
    1.32 +		--enable-amulecmd	\
    1.33 +		--enable-webserver	\
    1.34  		$CONFIGURE_ARGS &&
    1.35  	make $MAKEFLAGS &&
    1.36 -	make DESTDIR=$DESTDIR install
    1.37 +	make install DESTDIR=$DESTDIR
    1.38  }
    1.39  
    1.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.41 @@ -55,8 +56,8 @@
    1.42  {
    1.43  	mkdir -p $fs/usr/share
    1.44  	rm -rf $install/usr/share/man/?? $install/usr/share/man/*_*
    1.45 -	cp -a $install/usr/bin $fs/usr
    1.46 -	cp -a $install/usr/share/amule $fs/usr/share
    1.47 +	cp -a $install/usr/bin		$fs/usr
    1.48 +	cp -a $install/usr/share/amule	$fs/usr/share
    1.49  	# Remove unused files in this base package.
    1.50  	rm $fs/usr/share/amule/skins/kde4.zip
    1.51  	rm $fs/usr/share/amule/skins/gnome.zip
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/amule/stuff/patches/MuleDebug.cpp-2.3.2	Sat Mar 19 15:22:11 2022 +0100
     2.3 @@ -0,0 +1,20 @@
     2.4 +--- src/libs/common/MuleDebug.cpp.orig
     2.5 ++++ src/libs/common/MuleDebug.cpp
     2.6 +@@ -268,7 +268,7 @@
     2.7 + 		return;
     2.8 + 	}
     2.9 + 
    2.10 +-	bfd_vma vma = bfd_get_section_vma(abfd, section);
    2.11 ++	bfd_vma vma = bfd_section_vma(section);
    2.12 + 
    2.13 + 	unsigned long address = (unsigned long)_address;
    2.14 + 	if (address < vma) {
    2.15 +@@ -275,7 +275,7 @@
    2.16 + 		return;
    2.17 + 	}
    2.18 + 
    2.19 +-	bfd_size_type size = bfd_section_size(abfd, section);
    2.20 ++	bfd_size_type size = bfd_section_size(section);
    2.21 + 	if (address > (vma + size)) {
    2.22 + 		return;
    2.23 + 	}