Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1615bcecbf133c2ba3e1b469de7ee3d70d7faf35)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (1615bcecbf133c2ba3e1b469de7ee3d70d7faf35)
  • Date: Tue, 20 Sep 2011 09:19:10 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

ftp/rtorrent/DEPENDS | 1
ftp/rtorrent/DETAILS | 4 +--
ftp/rtorrent/HISTORY | 5
++++
ftp/rtorrent/PRE_BUILD | 2 -
ftp/rtorrent/TRIGGERS | 1
ftp/rtorrent/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch | 10
--------
ftp/rtorrent/rtorrent-ncurses.patch | 12
++++++++++
7 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 1615bcecbf133c2ba3e1b469de7ee3d70d7faf35
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

rtorrent: version 0.8.9, redid the patch as it somehow failed and switch
the forced dep to a check_self trigger.

diff --git a/ftp/rtorrent/DEPENDS b/ftp/rtorrent/DEPENDS
index 68df96e..3a5341e 100755
--- a/ftp/rtorrent/DEPENDS
+++ b/ftp/rtorrent/DEPENDS
@@ -1,5 +1,4 @@
depends libtorrent &&
-force_depends libtorrent &&
depends curl &&

optional_depends xmlrpc-c \
diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index 8d35f14..ef8f46a 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,12 +1,12 @@
SPELL=rtorrent
- VERSION=0.8.7
+ VERSION=0.8.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
WEB_SITE=http://libtorrent.rakshasa.no
ENTERED=20050214
LICENSE[0]=GPL
-
SOURCE_HASH=sha512:9853f9bf18f0c0e3471628a50817159e88f6a76dd212f2c11b742c695de5403ea3a0d2b72fcd170ec8f1e35d4d1a8ec14d35f0b8294fc6664a9cf2b9f4b88d54
+
SOURCE_HASH=sha512:32b6377279fc22a0e42f80f0d4275a9b940866bed639e0b022088380b9a6bffe9ec642eba3866f5ee3fb1d3cc1c63b75283b15726b59fead790f643d6a053b7d
KEYWORDS="bittorrent ftp"
SHORT='Rtorrent is a bittorrent client using libTorrent.'
cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 059670f..dabd83c 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,8 @@
+2011-09-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.8.9
+ * DEPENDS removed forced dep on libtorrent to avoid casting it every
time
+ * TRIGGERS: added a check_self on casting libtorrent
+
2011-04-17 Arwed von Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5.8.patch:
added patch to allow rtorrent to work with ncurses 5.8, patch from
diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
index df62c4f..be02560 100755
--- a/ftp/rtorrent/PRE_BUILD
+++ b/ftp/rtorrent/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 <
$SPELL_DIRECTORY/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
+patch -p0 < ${SPELL_DIRECTORY}/rtorrent-ncurses.patch
diff --git a/ftp/rtorrent/TRIGGERS b/ftp/rtorrent/TRIGGERS
new file mode 100755
index 0000000..ddec17c
--- /dev/null
+++ b/ftp/rtorrent/TRIGGERS
@@ -0,0 +1 @@
+on_cast libtorrent check_self
diff --git
a/ftp/rtorrent/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
b/ftp/rtorrent/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
deleted file mode 100644
index b9a09d4..0000000
--- a/ftp/rtorrent/rtorrent-0.8.7-canvas-patch-fix-for-ncurses-5-8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rtorrent-0.8.7/src/display/canvas.h 2011-03-01 14:56:25.000000000
+0800
-+++ rtorrent-0.8.7/src/display/canvas.h 2011-03-01 14:56:10.000000000
+0800
-@@ -48,7 +48,7 @@ class Canvas {
- public:
- typedef std::vector<Attributes> attributes_list;
-
-- 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) :
- m_window(newwin(height, width, y, x)) {}
- ~Canvas() { delwin(m_window); }
diff --git a/ftp/rtorrent/rtorrent-ncurses.patch
b/ftp/rtorrent/rtorrent-ncurses.patch
new file mode 100644
index 0000000..0d7f2e9
--- /dev/null
+++ b/ftp/rtorrent/rtorrent-ncurses.patch
@@ -0,0 +1,12 @@
+diff -Naur ./src/display/canvas.h ../rtorrent-fixed/src/display/canvas.h
+--- ./src/display/canvas.h 2011-04-07 14:36:10.000000000 +0200
++++ ../rtorrent-fixed/src/display/canvas.h 2011-09-20 16:06:02.520256895
+0200
+@@ -48,7 +48,7 @@
+ public:
+ typedef std::vector<Attributes> attributes_list;
+
+- 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); }
+
+ void refresh()
{ wnoutrefresh(m_window); }




Archive powered by MHonArc 2.6.24.

Top of Page