summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev2018-07-22 16:19:07 +0000
committerRosen Penev2018-07-22 23:09:33 +0000
commit7d5a934c97d9d1ad7f472eaefafc2ae30b6969fd (patch)
tree8ba1387d93a2aa7cf24cfd853ba73dab88a7beb7
parent84197cc5d00891e0ac65035f9151c03af26398ef (diff)
downloadpackages-7d5a934c97d9d1ad7f472eaefafc2ae30b6969fd.tar.gz
rtorrent: Update to 0.9.7
Also switch to tarball. Should be faster. Signed-off-by: Rosen Penev <rosenp@gmail.com>
-rw-r--r--net/rtorrent/Makefile15
-rw-r--r--net/rtorrent/patches/100-fix-cross_compile.patch10
-rw-r--r--net/rtorrent/patches/120-fix-ncurses.patch4
3 files changed, 8 insertions, 21 deletions
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 5de243ea73..a6021f3055 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -8,15 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rtorrent
-PKG_VERSION:=0.9.6-git-1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_VERSION:=0.9.7
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rakshasa/rtorrent.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=62cb5a4605c0664bc522e0e0da9c72f09cf643a9
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=3c6834b12ebfa8d62618f6e9dbc06dfa593861fa0b435d2fd1bddb0e886fc77b
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERSION)
+PKG_HASH:=5d9842fe48c9582fbea2c7bf9f51412c1ccbba07d059b257039ad53b863fe8bb
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
@@ -36,7 +34,6 @@ define Package/rtorrent/Default
TITLE:=BitTorrent client for ncurses
URL:=http://libtorrent.rakshasa.no/
DEPENDS:=+libcurl +libtorrent +libncursesw +libsigcxx +libpthread
- MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/rtorrent/Default/description
diff --git a/net/rtorrent/patches/100-fix-cross_compile.patch b/net/rtorrent/patches/100-fix-cross_compile.patch
index 82dcc7648b..50657df13d 100644
--- a/net/rtorrent/patches/100-fix-cross_compile.patch
+++ b/net/rtorrent/patches/100-fix-cross_compile.patch
@@ -1,13 +1,3 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 9, api version)
-
- AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
-
- AC_PROG_CXX
- AC_PROG_LIBTOOL
--- a/scripts/common.m4
+++ b/scripts/common.m4
@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t
diff --git a/net/rtorrent/patches/120-fix-ncurses.patch b/net/rtorrent/patches/120-fix-ncurses.patch
index f491de36a0..a6719f2e4a 100644
--- a/net/rtorrent/patches/120-fix-ncurses.patch
+++ b/net/rtorrent/patches/120-fix-ncurses.patch
@@ -6,6 +6,6 @@
- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
- ~Canvas() { delwin(m_window); }
+ ~Canvas() { if (!m_isDaemon) { delwin(m_window); } }
- void refresh() { wnoutrefresh(m_window); }
+ void refresh() { if (!m_isDaemon) { wnoutrefresh(m_window); } }