Add missing patches

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 61 insertions, 5 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/Manifest b/net-p2p/tribler/Manifest
index 51ee556366c5..da879dbf31b6 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tribler-fix-global-declarations.patch 1745 RMD160 49b39c42d92308839644ab69fd12ef0a7feabcf2 SHA1 a1daea014e14b815ac3857881ebb240ac9e53f90 SHA256 958a18e540f04e7aa5ffb4f0a5bc6eefdfffbfca937362cb6f9d2e2f0a338e94
+AUX tribler-log2homedir.patch 494 RMD160 b4a4ceed309505db9e2536c8c6463c5410fab7bf SHA1 083db33b11f5254828e5eb7200e15f9cdb46c8c5 SHA256 5e81e50bfe5b4272d972f405d5306f09956d0d5f177f7fc05fcd336374fee6d7
 DIST tribler_5.5.10-1ubuntu1_all.deb 2296972 RMD160 89a91ae15a23331366c226140c12a24e334786a0 SHA1 f47287cd70b95040653edbaccb8d7a56d59f34a9 SHA256 b4a3cc0a118f7498cb749116d8fd77f20b228c30e9e897e4b807796e782fbd62
 EBUILD tribler-5.5.10-r1.ebuild 1670 RMD160 db8097e9ec8d5e3852f501ebc131a55d101c466c SHA1 8fca5c9b345adb5fef571f54839efc75b789f163 SHA256 9cfb1a14c23a389745b2b95932eabc6b9f12948c09cd9488bdf8d703a4234f45
 EBUILD tribler-5.5.10.ebuild 1364 RMD160 ace6df11a24f959e91fe97a792552771afd000fe SHA1 55104640ae4956908a14b82fc235eca3972d2bd9 SHA256 5b620450e317c7f2f5a397e760779603006afa5a2b8ffedce7dfba2defa0c661
-MISC ChangeLog 651 RMD160 ad46602109461dda8ce24e2281b0dd21348f1d8e SHA1 c5efca36de48b0aca5787e57d0f4bd5bf368fa52 SHA256 d1a7eeb2962b574afdeaced461cd61fb19dab7e79f756fc140a90fb24aaece81
+MISC ChangeLog 813 RMD160 0a59eb556846de39d8cf27eb92081a068b7343fa SHA1 886896c20e180b2a080696ab9b34bb681bbfbd6e SHA256 c4409a93a60068e77ab205173cfd4e1095f9d52562febeb99ba91fd81b28d09c
 MISC metadata.xml 456 RMD160 c23da6949f1a748719d924a5c998efbdee63847a SHA1 83c4d741970af014737f6bfcb2a6791867b56be5 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk86xtIACgkQl5yvQNBFVTUSnwCfaTyhVwG4Qb7FxIyTmkw4IxnE
-JRgAnj1CNq6iqlokjhAcTB6i9T11thtv
-=RjJ/
+iEYEAREIAAYFAk86ya8ACgkQl5yvQNBFVTXRHgCglrK6aJJ74AdGbKhznKAS++ia
+KDUAn1aKoGWtAZAlAvhWMhSoVyC1o+WQ
+=c/W2
 -----END PGP SIGNATURE-----
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