Attachment #124997 for bug #168535

View | Details | Raw Unified | Return to bug 168535
Collapse All | Expand All

Lines 6-12 Link Here

(-)audio/pithos/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= pithos	8	PORTNAME= pithos
9	PORTVERSION= 0.3.14	9	PORTVERSION= 0.3.17
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= audio	11	CATEGORIES= audio
12	MASTER_SITES= DEBIAN	12	MASTER_SITES= DEBIAN
Lines 35-41 Link Here
35		35
36	post-patch:	36	post-patch:
37	${REINPLACE_CMD} -e "s,../data/,${DATADIR}/," ${WRKSRC}/pithos/pithosconfig.py	37	${REINPLACE_CMD} -e "s,../data/,${DATADIR}/," ${WRKSRC}/pithos/pithosconfig.py
38	${REINPLACE_CMD} -e "s,Icon=pithos,${DATADIR}/media/icon.png," ${WRKSRC}/pithos.desktop.in	38	${REINPLACE_CMD} -e "s,Icon=pithos,${DATADIR}/media/icon.png," ${WRKSRC}/pithos.desktop
39		39
40	post-install:	40	post-install:
41	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \	41	@${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \

Lines 1-2 Link Here

(-)audio/pithos/distinfo (-2 / +2 lines)
1	SHA256 (pithos_0.3.14.orig.tar.gz) = 94bddb70259712d5605de461e7d2cf816d5b0b65ffedf35cee71b2d1f7041bc5	1	SHA256 (pithos_0.3.17.orig.tar.gz) = ef6ee1545fa60b065b0043d79fe89fd1c1b70fe4ae944055d2c7b9d890cf1bde
2	SIZE (pithos_0.3.14.orig.tar.gz) = 141370	2	SIZE (pithos_0.3.17.orig.tar.gz) = 141332

Line 0 Link Here

(-)audio/pithos/files/patch-bin-pithos (+8 lines)
	1	--- bin/pithos 2012-05-03 13:47:11.000000000 -0700
	2	+++ bin/pithos 2012-06-01 11:27:29.000000000 -0700
	3	@@ -1,4 +1,4 @@
	4	-#!/usr/bin/python
	5	+#!/usr/bin/env python
	6	# -- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; --
	7	### BEGIN LICENSE
	8	# Copyright (C) 2010-2012 Kevin Mehall <km@kevinmehall.net>

Lines 1-8 Link Here

(-)audio/pithos/files/patch-bin__pithos (-8 lines)
1	--- ./bin/pithos.orig 2011-12-14 16:33:47.000000000 -0800
2	+++ ./bin/pithos 2012-04-16 10:58:58.472393323 -0700
3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/python
5	+#!/usr/bin/env python
6	# -- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; --
7	### BEGIN LICENSE
8	# Copyright (C) 2010 Kevin Mehall <km@kevinmehall.net>




--- pithos/pandora/pandora.py.orig	2011-12-14 16:33:47.000000000 -0800
+++ pithos/pandora/pandora.py	2012-04-27 13:41:25.000000000 -0700
@@ -22,7 +22,7 @@
 from pithos.pandora.xmlrpc import *
 from pithos.pandora.blowfish import Blowfish
 
-PROTOCOL_VERSION = "33"
+PROTOCOL_VERSION = "34"
 RPC_URL = "www.pandora.com/radio/xmlrpc/v"+PROTOCOL_VERSION+"?"
 USER_AGENT = "Mozilla/5.0 (X11; U; Linux i586; de; rv:5.0) Gecko/20100101 Firefox/5.0 (compatible; Pithos/0.3)"
 HTTP_TIMEOUT = 30
@@ -161,12 +161,16 @@
     def connect(self, user, password):
         self.rid = "%07iP"%(int(time.time()) % 10000000)
         self.listenerId = self.authToken = None
+
+        logging.info("Attempting to connect...");
+        timeurl = urllib2.urlopen("http://ridetheclown.com/s2/synctime.php");
+        pandora_time=int(timeurl.read(),10);
+        logging.info("Synctime is %s", pandora_time)
         
-        pandora_time = self.xmlrpc_call('misc.sync', [], [], secure=True, includeTime=False)
-        pandora_time = int(re.sub(r"\D", "", pandora_decrypt(pandora_time)))
         self.time_offset =  pandora_time - time.time()
             
-        user = self.xmlrpc_call('listener.authenticateListener', [user, password], [], secure=True)
+        user = self.xmlrpc_call('listener.authenticateListener', ["",user, password,"html5tuner","","","HTML5",True], [], secure=True)
+
         
         self.webAuthToken = user['webAuthToken']
         self.listenerId = user['listenerId']

Lines 1-6 Link Here

(-)audio/pithos/files/patch-setup.py (-9 / +14 lines)
1	--- ./setup.py.orig 2011-12-14 16:33:47.000000000 -0800	1	--- setup.py 2012-05-03 13:47:11.000000000 -0700
2	+++ ./setup.py 2012-04-16 10:58:58.477390915 -0700	2	+++ setup.py 2012-06-01 11:40:31.000000000 -0700
3	@@ -17,67 +17,19 @@	3	@@ -17,74 +17,19 @@
4		4
5	###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################	5	###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
6		6
Lines 54-59 Link Here
54	- DistUtilsExtra.auto.install_auto.run(self)	54	- DistUtilsExtra.auto.install_auto.run(self)
55	- update_data_path(self.prefix, previous_value)	55	- update_data_path(self.prefix, previous_value)
56	-	56	-
		57	-from distutils.cmd import Command
		58	-class OverrideI18NCommand(Command):
		59	- def initialize_options(self): pass
		60	- def finalize_options(self): pass
		61	- def run(self):
		62	- self.distribution.data_files.append(('share/applications', ['pithos.desktop']))
		63	-
57	-from DistUtilsExtra.command.build_extra import build_extra	64	-from DistUtilsExtra.command.build_extra import build_extra
58	-from DistUtilsExtra.command.build_icons import build_icons	65	-from DistUtilsExtra.command.build_icons import build_icons
59	-	66	-
Lines 63-80 Link Here
63	name='pithos',	70	name='pithos',
64	- version='0.3',	71	- version='0.3',
65	- ext_modules=[],	72	- ext_modules=[],
66	- license='GPL-3',	73	+ version='0.3.17',
67	+ version='0.3.14',	74	license='GPL-3',
68	+ description='Pandora.com client for the GNOME desktop',
69	author='Kevin Mehall',	75	author='Kevin Mehall',
70	author_email='km@kevinmehall.net',	76	author_email='km@kevinmehall.net',
71	- description='Pandora.com client for the GNOME desktop',	77	description='Pandora.com client for the GNOME desktop',
72	- #long_description='Here a longer description',	78	- #long_description='Here a longer description',
73	url='https://launchpad.net/pithos',	79	url='https://launchpad.net/pithos',
74	- cmdclass={'install': InstallAndUpdateDataDirectory, 'build_icons':build_icons, 'build':build_extra}	80	- cmdclass={'install': InstallAndUpdateDataDirectory, 'build_icons':build_icons, 'build':build_extra, 'build_i18n':OverrideI18NCommand}
75	- )	81	- )
76	-	82	-
77	+ license='GPL-3',
78	+ packages=['pithos', 'pithos.pandora', 'pithos.plugins'],	83	+ packages=['pithos', 'pithos.pandora', 'pithos.plugins'],
79	+ package_dir = {'pithos':'pithos'}	84	+ package_dir = {'pithos':'pithos'}
80	+)	85	+)

Return to bug 168535

Lines 1-31 Link Here

(-)audio/pithos/files/patch-pandora.py (-31 lines)
1	--- pithos/pandora/pandora.py.orig 2011-12-14 16:33:47.000000000 -0800
2	+++ pithos/pandora/pandora.py 2012-04-27 13:41:25.000000000 -0700
3	@@ -22,7 +22,7 @@
4	from pithos.pandora.xmlrpc import *
5	from pithos.pandora.blowfish import Blowfish
6
7	-PROTOCOL_VERSION = "33"
8	+PROTOCOL_VERSION = "34"
9	RPC_URL = "www.pandora.com/radio/xmlrpc/v"+PROTOCOL_VERSION+"?"
10	USER_AGENT = "Mozilla/5.0 (X11; U; Linux i586; de; rv:5.0) Gecko/20100101 Firefox/5.0 (compatible; Pithos/0.3)"
11	HTTP_TIMEOUT = 30
12	@@ -161,12 +161,16 @@
13	def connect(self, user, password):
14	self.rid = "%07iP"%(int(time.time()) % 10000000)
15	self.listenerId = self.authToken = None
16	+
17	+ logging.info("Attempting to connect...");
18	+ timeurl = urllib2.urlopen("http://ridetheclown.com/s2/synctime.php");
19	+ pandora_time=int(timeurl.read(),10);
20	+ logging.info("Synctime is %s", pandora_time)
21
22	- pandora_time = self.xmlrpc_call('misc.sync', [], [], secure=True, includeTime=False)
23	- pandora_time = int(re.sub(r"\D", "", pandora_decrypt(pandora_time)))
24	self.time_offset = pandora_time - time.time()
25
26	- user = self.xmlrpc_call('listener.authenticateListener', [user, password], [], secure=True)
27	+ user = self.xmlrpc_call('listener.authenticateListener', ["",user, password,"html5tuner","","","HTML5",True], [], secure=True)
28	+
29
30	self.webAuthToken = user['webAuthToken']
31	self.listenerId = user['listenerId']