Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 43 insertions, 13 deletions

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 <execinfo.h>
+-      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 <cstdio>
- #include <rak/error_number.h>
- #include <cstdio>
- #include <sys/types.h>