diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-02-14 20:52:53 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-02-14 20:52:53 +0000 |
| commit | ebbf115aff0c73453fe1c99454e97fc42d868283 (patch) | |
| tree | 6cd9a03618cf269a2b9c43a35076f2db24c935b4 /net-p2p/tribler | |
| parent | Initial version of tox. Ebuild contributed by nicolas.pinto@gmail.com. (diff) | |
| download | gentoo-2-ebbf115aff0c73453fe1c99454e97fc42d868283.tar.gz gentoo-2-ebbf115aff0c73453fe1c99454e97fc42d868283.tar.bz2 gentoo-2-ebbf115aff0c73453fe1c99454e97fc42d868283.zip | |
Add missing patches
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/tribler')
| -rw-r--r-- | net-p2p/tribler/ChangeLog | 7 | ||||
| -rw-r--r-- | net-p2p/tribler/files/tribler-fix-global-declarations.patch | 37 | ||||
| -rw-r--r-- | net-p2p/tribler/files/tribler-log2homedir.patch | 12 |
3 files changed, 55 insertions, 1 deletions
diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog index c4898c9598de..005b8e1dac8c 100644 --- a/net-p2p/tribler/ChangeLog +++ b/net-p2p/tribler/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/tribler # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.3 2012/02/14 20:40:40 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.4 2012/02/14 20:52:53 blueness Exp $ + + 14 Feb 2012; Anthony G. Basile <blueness@gentoo.org> + +files/tribler-fix-global-declarations.patch, + +files/tribler-log2homedir.patch: + Add missing patches *tribler-5.5.10-r1 (14 Feb 2012) diff --git a/net-p2p/tribler/files/tribler-fix-global-declarations.patch b/net-p2p/tribler/files/tribler-fix-global-declarations.patch new file mode 100644 index 000000000000..a87c232e58ab --- /dev/null +++ b/net-p2p/tribler/files/tribler-fix-global-declarations.patch @@ -0,0 +1,37 @@ +diff -Naur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py +--- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py 2012-02-11 11:54:10.000000000 -0500 ++++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py 2012-02-11 11:53:15.000000000 -0500 +@@ -155,10 +155,10 @@ + raise SanitizeError, '? Channel must be a number' + + def handle(self): ++ global stop_server + while not stop_server: + line = self.rfile.readline().strip().upper() + if line == 'KILL': +- global stop_server + stop_server = True + return + if line == 'EXIT': +diff -Naur usr.orig/share/tribler/Tribler/Player/swarmplayer.py usr/share/tribler/Tribler/Player/swarmplayer.py +--- usr.orig/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:54:10.000000000 -0500 ++++ usr/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:53:15.000000000 -0500 +@@ -438,9 +438,9 @@ + + s_play = status.get_or_create_status_element("playable", False) + if playable: ++ global START_TIME + if preprogress < 1.0: + if s_play.get_value() == True: +- global START_TIME + status.create_and_add_event("failed_after", [time.time() - START_TIME]) + START_TIME = time.time() + +@@ -448,7 +448,6 @@ + + elif s_play.get_value() == False: + s_play.set_value(True) +- global START_TIME + status.create_and_add_event("playable_in", [time.time() - START_TIME]) + START_TIME = time.time() + diff --git a/net-p2p/tribler/files/tribler-log2homedir.patch b/net-p2p/tribler/files/tribler-log2homedir.patch new file mode 100644 index 000000000000..204b4f5106a4 --- /dev/null +++ b/net-p2p/tribler/files/tribler-log2homedir.patch @@ -0,0 +1,12 @@ +diff -Naur usr.orig/bin/tribler usr/bin/tribler +--- usr.orig/bin/tribler 2012-02-07 10:33:48.000000000 -0500 ++++ usr/bin/tribler 2012-02-11 12:19:05.000000000 -0500 +@@ -6,5 +6,7 @@ + export PYTHONPATH="$PYTHONPATH":$_TRIBLERPATH + + echo "Starting Tribler..." ++STATEDIR="$HOME/.Tribler" ++[ ! -d $STATEDIR ] && mkdir -p $STATEDIR + cd $_TRIBLERPATH +-exec python -O Tribler/Main/tribler.py "$@" > /tmp/$USER-tribler.log 2>&1 ++exec python -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1 |