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

(-)i/audio/sonata/Makefile (-23 / +12 lines)
Lines 1-45 Link Here
1
# Created by: Nicola Vitale <nivit@FreeBSD.org>
1
# Created by: Nicola Vitale <nivit@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	sonata
4
PORTNAME=		sonata
5
PORTVERSION=	1.6.2.1
5
DISTVERSION=		1.7b1-22
6
PORTREVISION=	12
6
DISTVERSIONSUFFIX=	-gcee3555
7
CATEGORIES=	audio python
7
CATEGORIES=		audio python
8
MASTER_SITES=	http://codingteam.net/project/sonata/upload/releases/
9
8
10
MAINTAINER=	nivit@FreeBSD.org
9
MAINTAINER=	nivit@FreeBSD.org
11
COMMENT=	Elegant music player for MPD
10
COMMENT=	Elegant music player for MPD
12
11
13
LICENSE=	GPLv3
12
LICENSE=	GPLv3
14
13
15
DEPRECATED=	Old, uses EOLed python27
14
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-mpd2>=0.4.6:audio/py-python-mpd2@${PY_FLAVOR}
16
EXPIRATION_DATE=	2020-03-01
17
15
18
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${PY_FLAVOR}
16
USE_GITHUB=	yes
17
GH_ACCOUNT=	multani
19
18
20
USES=		gettext gnome pkgconfig python:2.7
19
USES=		gettext pkgconfig python:3.5+
21
USE_GNOME=	pygtk2
20
USE_GNOME=	pygobject3
22
USE_PYTHON=	distutils autoplist
21
USE_PYTHON=	distutils autoplist
23
22
24
OPTIONS_DEFINE=	DOCS MANPAGES MMKEYS MPD PYGNOMEEXTRAS TAGLIB
23
OPTIONS_DEFINE=	DOCS MMKEYS MPD TAGLIB
25
OPTIONS_DEFAULT=	MPD
24
OPTIONS_DEFAULT=	MPD
26
MMKEYS_DESC=	Enable instance single support for mmkeys
25
MMKEYS_DESC=	Enable instance single support for mmkeys
27
MPD_DESC=	Install Music Player Daemon
26
MPD_DESC=	Install Music Player Daemon
28
PYGNOMEEXTRAS_DESC=	Use py-gnome-extras for enhanced system tray
29
TAGLIB_DESC=	Install support for editing metadata
27
TAGLIB_DESC=	Install support for editing metadata
30
OPTIONS_SUB=	yes
28
OPTIONS_SUB=	yes
31
29
32
MANPAGES_MAKE_ENV_OFF=	NO_INSTALL_MANPAGES=yes
33
DOCS_MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
34
MPD_RUN_DEPENDS+=	musicpd:audio/musicpd
30
MPD_RUN_DEPENDS+=	musicpd:audio/musicpd
35
MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${PY_FLAVOR}
31
MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR}
36
PYGNOMEEXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras@${PY_FLAVOR}
32
TAGLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${FLAVOR}
37
PYGNOMEEXTRAS_IGNORE=	Dependency py-gnome-extras gone.
38
TAGLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${PY_FLAVOR}
39
40
post-patch:
41
	@${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
42
		-e 's,%%PREFIX%%,${PREFIX},' \
43
		${WRKSRC}/${PYSETUP} ${WRKSRC}/sonata.py
44
33
45
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)i/audio/sonata/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (sonata-1.6.2.1.tar.gz) = 89aa311286edc4f390061c479894835789259b9c76c944f18187374ba8e53dbf
1
TIMESTAMP = 1580382764
2
SIZE (sonata-1.6.2.1.tar.gz) = 454757
2
SHA256 (multani-sonata-1.7b1-22-gcee3555_GH0.tar.gz) = ac28360a5c576ad40c6fdf591de30ed90c4a5f63a366254794ac2a646d3ae680
3
SIZE (multani-sonata-1.7b1-22-gcee3555_GH0.tar.gz) = 2258513
(-)c/audio/sonata/files/patch-setup.py (-77 lines)
Removed Link Here
1
--- setup.py.orig	2009-09-21 21:02:16 UTC
2
+++ setup.py
3
@@ -54,6 +54,38 @@ VERSION = %r
4
 """ % sonata.svnversion.VERSION)
5
 versionfile.close()
6
 
7
+port_data_files=[('share/applications', ['sonata.desktop']),
8
+                ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
9
+                ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
10
+                ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
11
+                ('share/locale/ru/LC_MESSAGES', ['mo/ru/sonata.mo']),
12
+                ('share/locale/fr/LC_MESSAGES', ['mo/fr/sonata.mo']),
13
+                ('share/locale/zh_CN/LC_MESSAGES', ['mo/zh_CN/sonata.mo']),
14
+                ('share/locale/sv/LC_MESSAGES', ['mo/sv/sonata.mo']),
15
+                ('share/locale/es/LC_MESSAGES', ['mo/es/sonata.mo']),
16
+                ('share/locale/fi/LC_MESSAGES', ['mo/fi/sonata.mo']),
17
+                ('share/locale/nl/LC_MESSAGES', ['mo/nl/sonata.mo']),
18
+                ('share/locale/it/LC_MESSAGES', ['mo/it/sonata.mo']),
19
+                ('share/locale/cs/LC_MESSAGES', ['mo/cs/sonata.mo']),
20
+                ('share/locale/da/LC_MESSAGES', ['mo/da/sonata.mo']),
21
+                ('share/locale/ca/LC_MESSAGES', ['mo/ca/sonata.mo']),
22
+                ('share/locale/ar/LC_MESSAGES', ['mo/ar/sonata.mo']),
23
+                ('share/locale/pt_BR/LC_MESSAGES', ['mo/pt_BR/sonata.mo']),
24
+                ('share/locale/et/LC_MESSAGES', ['mo/et/sonata.mo']),
25
+                ('share/locale/tr/LC_MESSAGES', ['mo/tr/sonata.mo']),
26
+                ('share/locale/be@latin/LC_MESSAGES', ['mo/be@latin/sonata.mo']),
27
+                ('share/locale/el_GR/LC_MESSAGES', ['mo/el_GR/sonata.mo']),
28
+                ('share/locale/sk/LC_MESSAGES', ['mo/sk/sonata.mo']),
29
+                ('share/locale/ja/LC_MESSAGES', ['mo/ja/sonata.mo']),
30
+                ('share/locale/sl/LC_MESSAGES', ['mo/sl/sonata.mo']),
31
+                ('share/locale/zh_TW/LC_MESSAGES', ['mo/zh_TW/sonata.mo']),
32
+                ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])]
33
+
34
+if not os.environ.has_key('NOPORTDOCS'):
35
+	port_data_files.append(('share/doc/sonata',['README',]))
36
+if not os.environ.has_key('NO_INSTALL_MANPAGES'):
37
+	port_data_files.append(('man/man1', ['sonata.1']))
38
+
39
 setup(name='Sonata',
40
         version="1.6.2.1",
41
         description='GTK+ client for the Music Player Daemon (MPD).',
42
@@ -77,34 +109,7 @@ setup(name='Sonata',
43
         extra_link_args=capture("pkg-config --libs gtk+-2.0 pygtk-2.0").split()
44
          ),],
45
         scripts = ['sonata/sonata'],
46
-        data_files=[('share/sonata', ['README', 'CHANGELOG', 'TODO', 'TRANSLATORS']),
47
-                    ('share/applications', ['sonata.desktop']),
48
-                    ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
49
-                    ('share/man/man1', ['sonata.1']),
50
-                    ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
51
-                    ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
52
-                    ('share/locale/ru/LC_MESSAGES', ['mo/ru/sonata.mo']),
53
-                    ('share/locale/fr/LC_MESSAGES', ['mo/fr/sonata.mo']),
54
-                    ('share/locale/zh_CN/LC_MESSAGES', ['mo/zh_CN/sonata.mo']),
55
-                    ('share/locale/sv/LC_MESSAGES', ['mo/sv/sonata.mo']),
56
-                    ('share/locale/es/LC_MESSAGES', ['mo/es/sonata.mo']),
57
-                    ('share/locale/fi/LC_MESSAGES', ['mo/fi/sonata.mo']),
58
-                    ('share/locale/nl/LC_MESSAGES', ['mo/nl/sonata.mo']),
59
-                    ('share/locale/it/LC_MESSAGES', ['mo/it/sonata.mo']),
60
-                    ('share/locale/cs/LC_MESSAGES', ['mo/cs/sonata.mo']),
61
-                    ('share/locale/da/LC_MESSAGES', ['mo/da/sonata.mo']),
62
-                    ('share/locale/ca/LC_MESSAGES', ['mo/ca/sonata.mo']),
63
-                    ('share/locale/ar/LC_MESSAGES', ['mo/ar/sonata.mo']),
64
-                    ('share/locale/pt_BR/LC_MESSAGES', ['mo/pt_BR/sonata.mo']),
65
-                    ('share/locale/et/LC_MESSAGES', ['mo/et/sonata.mo']),
66
-                    ('share/locale/tr/LC_MESSAGES', ['mo/tr/sonata.mo']),
67
-                    ('share/locale/be@latin/LC_MESSAGES', ['mo/be@latin/sonata.mo']),
68
-                    ('share/locale/el_GR/LC_MESSAGES', ['mo/el_GR/sonata.mo']),
69
-                    ('share/locale/sk/LC_MESSAGES', ['mo/sk/sonata.mo']),
70
-                    ('share/locale/ja/LC_MESSAGES', ['mo/ja/sonata.mo']),
71
-                    ('share/locale/sl/LC_MESSAGES', ['mo/sl/sonata.mo']),
72
-                    ('share/locale/zh_TW/LC_MESSAGES', ['mo/zh_TW/sonata.mo']),
73
-                    ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])],
74
+	data_files=port_data_files,
75
         )
76
 
77
 # Cleanup (remove /build, /mo, and *.pyc files:
(-)c/audio/sonata/files/patch-sonata.py (-11 lines)
Removed Link Here
1
--- sonata.py.orig	2009-09-21 21:02:16 UTC
2
+++ sonata.py
3
@@ -59,6 +59,8 @@ except ImportError:
4
 # https://bugs.launchpad.net/ubuntu/+source/zsi/+bug/208855
5
 sys.path.append('/usr/lib/python2.5/site-packages/oldxml')
6
 
7
+sys.path.remove('%%PREFIX%%/bin')
8
+
9
 # hint for gnome.init to set the process name to 'sonata'
10
 if platform.system() == 'Linux':
11
 	sys.argv[0] = 'sonata'
(-)c/audio/sonata/files/patch-sonata_main.py (-32 lines)
Removed Link Here
1
--- sonata/main.py.orig	2009-09-21 21:02:16 UTC
2
+++ sonata/main.py
3
@@ -989,13 +989,14 @@ class Base(object):
4
 						self.repeatmenu.set_active(self.status['repeat'] == '1')
5
 					if not self.last_random or self.last_random != self.status['random']:
6
 						self.randommenu.set_active(self.status['random'] == '1')
7
-					if self.status['xfade'] == '0':
8
-						self.config.xfade_enabled = False
9
-					else:
10
-						self.config.xfade_enabled = True
11
-						self.config.xfade = int(self.status['xfade'])
12
-						if self.config.xfade > 30:
13
-							self.config.xfade = 30
14
+					self.config.xfade_enabled = False
15
+					if 'xfade' in self.status:
16
+						xfade = int(self.status['xfade'])
17
+						if xfade != 0:
18
+							self.config.xfade_enabled = True
19
+							self.config.xfade = xfade
20
+							if self.config.xfade > 30:
21
+								self.config.xfade = 30
22
 					self.last_repeat = self.status['repeat']
23
 					self.last_random = self.status['random']
24
 					return
25
@@ -3400,4 +3401,7 @@ class Base(object):
26
 		self.on_currsong_notify(force_popup=True)
27
 	
28
 	def main(self):
29
+		gtk.gdk.threads_init()
30
+		gtk.gdk.threads_enter()
31
 		gtk.main()
32
+		gtk.gdk.threads_leave()

Return to bug 243725