From f2528861153e4fa9de92e246df9ef03b667e5e39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Mar 2011 13:20:39 +0100 Subject: update to latest upstream version --- package/rtorrent/Makefile | 6 ++-- package/rtorrent/patches/patch-configure | 41 ++++++++++++++++++++++ package/rtorrent/patches/patch-ltmain_sh | 4 +-- .../rtorrent/patches/patch-src_rpc_scgi_task_cc | 11 ------ 4 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 package/rtorrent/patches/patch-configure delete mode 100644 package/rtorrent/patches/patch-src_rpc_scgi_task_cc diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 303c6037c..d47cce446 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rtorrent -PKG_VERSION:= 0.8.5 +PKG_VERSION:= 0.8.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783 +PKG_MD5SUM:= b804c45c01c40312926bcea6b55bb084 PKG_DESCR:= console torrent application PKG_SECTION:= p2p PKG_DEPENDS:= libncurses libtorrent libcurl @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -post-install: +rtorrent-install: ${INSTALL_DIR} ${IDIR_RTORRENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/rtorrent ${IDIR_RTORRENT}/usr/bin diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure new file mode 100644 index 000000000..eeb358399 --- /dev/null +++ b/package/rtorrent/patches/patch-configure @@ -0,0 +1,41 @@ +--- rtorrent-0.8.6.orig/configure 2009-11-30 16:45:22.000000000 +0100 ++++ rtorrent-0.8.6/configure 2011-03-05 11:45:35.000000000 +0100 +@@ -14566,38 +14566,6 @@ fi + + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5 +-$as_echo_n "checking for execinfo.h... " >&6; } +- +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define USE_EXECINFO 1" >>confdefs.h +- +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi + + + diff --git a/package/rtorrent/patches/patch-ltmain_sh b/package/rtorrent/patches/patch-ltmain_sh index 9b491ecbb..7fc18fefb 100644 --- a/package/rtorrent/patches/patch-ltmain_sh +++ b/package/rtorrent/patches/patch-ltmain_sh @@ -1,5 +1,5 @@ ---- rtorrent-0.8.5.orig/ltmain.sh 2009-06-18 21:37:48.000000000 +0200 -+++ rtorrent-0.8.5/ltmain.sh 2011-01-09 01:46:11.000000000 +0100 +--- rtorrent-0.8.6.orig/ltmain.sh 2009-11-30 16:44:25.000000000 +0100 ++++ rtorrent-0.8.6/ltmain.sh 2011-03-05 11:44:54.000000000 +0100 @@ -5516,27 +5516,6 @@ func_mode_link () esac fi diff --git a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc deleted file mode 100644 index d282b8139..000000000 --- a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.5.orig/src/rpc/scgi_task.cc 2009-05-14 14:34:42.000000000 +0200 -+++ rtorrent-0.8.5/src/rpc/scgi_task.cc 2011-01-09 01:42:55.000000000 +0100 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include - #include - #include - #include -- cgit v1.2.3