aMule: update to 2.3.1

aMule 2.3.1 for trunk and the latest Attitude Adjustment

Signed-off-by: Massimo Tumminia <matumminia@tiscali.it>
SVN-Revision: 40583

diff --git a/net/amule/Makefile b/net/amule/Makefile
index ab1f8f14894b79631e7595a1e4b9c604b8b4e42f..02769aadb84ea6431f8568a67c06b958981dc5ce 100644 (file)
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aMule
-PKG_VERSION:=2.2.6
+PKG_VERSION:=2.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/amule
-PKG_MD5SUM:=530d9b48187e36f78fc21bb19e94326d
+PKG_MD5SUM:=31724290a440943f5b05d4dca413fe02
 
 PKG_BUILD_DEPENDS:=libgd
 

diff --git a/net/amule/patches/001-gcc-fix.patch b/net/amule/patches/001-gcc-fix.patch
new file mode 100644 (file)
index 0000000..77b0bd7
--- /dev/null
+++ b/net/amule/patches/001-gcc-fix.patch
@@ -0,0 +1,19 @@
+--- a/src/ObservableQueue.h
++++ b/src/ObservableQueue.h
+@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-      NotifyObservers( EventType( EventType::STARTING ), o );
++      this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-      NotifyObservers( EventType( EventType::STOPPING ), o );
++      this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 

diff --git a/net/amule/patches/001-no_backtrace.patch b/net/amule/patches/001-no_backtrace.patch
deleted file mode 100644 (file)
index 7676235..0000000
--- a/net/amule/patches/001-no_backtrace.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: aMule-2.2.6/configure
-===================================================================
---- aMule-2.2.6.orig/configure 2012-07-28 23:50:12.000000000 +0200
-+++ aMule-2.2.6/configure      2012-07-28 23:50:51.000000000 +0200
-@@ -18375,93 +18375,6 @@
- 
- 
- 
--# Check for bfd.h (to have proper backtraces without using wxExecute)
--
--      echo "$as_me:$LINENO: checking for bfd" >&5
--echo $ECHO_N "checking for bfd... $ECHO_C" >&6
--      result=no
--      for bfd_ldadd in "" "${LIBINTL}"; do
--              mule_backup_LIBS="$LIBS"
--              mule_backup_LDFLAGS="$LDFLAGS"
--              LIBS="-lbfd -liberty ${bfd_ldadd} ${ZLIB_LIBS} $LIBS"
--              LDFLAGS="$LDFLAGS ${ZLIB_LDFLAGS}"
--              cat >conftest.$ac_ext <<_ACEOF
--
--                      /* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--                              #include <ansidecl.h>
--                              #include <bfd.h>
--
--int
--main ()
--{
--
--                              char *dummy = bfd_errmsg(bfd_get_error());
--
--  ;
--  return 0;
--}
--
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--       { ac_try='test -z "$ac_c_werror_flag"
--                       || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--       { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--                      result=yes
--                      BFD_CPPFLAGS="-DHAVE_BFD"
--                      BFD_LIBS="-lbfd -liberty ${bfd_ldadd}"
--                      LIBS="$mule_backup_LIBS"
--                      LDFLAGS="$mule_backup_LDFLAGS"
--                      break
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--              LIBS="$mule_backup_LIBS"
--              LDFLAGS="$mule_backup_LDFLAGS"
--      done
--
--      echo "$as_me:$LINENO: result: $result" >&5
--echo "${ECHO_T}$result" >&6
--
--      if test $result = no; then
--  { echo "$as_me:$LINENO: WARNING:
--      bfd.h not found or unusable, please install binutils development
--      package if you are a developer or want to help testing aMule" >&5
--echo "$as_me: WARNING:
--      bfd.h not found or unusable, please install binutils development
--      package if you are a developer or want to help testing aMule" >&2;}
--
--fi
--
--
-       echo "$as_me:$LINENO: checking for <execinfo.h> and backtrace()" >&5
- echo $ECHO_N "checking for <execinfo.h> and backtrace()... $ECHO_C" >&6
-       cat >conftest.$ac_ext <<_ACEOF