1 |
commit: f1c2076d51472818349ce4b026f5b13a000ce70f |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 2 00:06:43 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 00:08:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c2076d |
7 |
|
8 |
media-sound/pithos-1.5.0: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
12 |
|
13 |
media-sound/pithos/Manifest | 1 + |
14 |
media-sound/pithos/files/pithos-1.5.0-py38.patch | 41 ++++++++++++ |
15 |
media-sound/pithos/files/pithos-1.5.0-tests.patch | 23 +++++++ |
16 |
media-sound/pithos/pithos-1.5.0.ebuild | 78 +++++++++++++++++++++++ |
17 |
4 files changed, 143 insertions(+) |
18 |
|
19 |
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest |
20 |
index fb71e039cd7..c6d92b6185b 100644 |
21 |
--- a/media-sound/pithos/Manifest |
22 |
+++ b/media-sound/pithos/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4 |
25 |
+DIST pithos-1.5.0.tar.gz 123047 BLAKE2B 6f93a41bdda6c3e9baf4d71248748d4e798f9426377fcdf5dded0bdbfec92278f98c215fe818b4d1fc5378d47275539d3a559f7b9d9d8c920f5218431b77c3b3 SHA512 eec2d2fa2fec7f87decc5934d4e1c2f8e11754cb1e042e749be102b27353811a6868636b51b8b9f88ad6f649a12347b82da98d81a476ad3b610ef1049155b657 |
26 |
|
27 |
diff --git a/media-sound/pithos/files/pithos-1.5.0-py38.patch b/media-sound/pithos/files/pithos-1.5.0-py38.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..dd4327a0d3f |
30 |
--- /dev/null |
31 |
+++ b/media-sound/pithos/files/pithos-1.5.0-py38.patch |
32 |
@@ -0,0 +1,41 @@ |
33 |
+commit 3a23742614058b4bc97d71e1bb826e19891f0d24 |
34 |
+Author: JasonLG1979 <jasonlevigray3@×××××.com> |
35 |
+Date: Sun Mar 22 20:50:53 2020 -0500 |
36 |
+ |
37 |
+ Quiet SyntaxWarning: "is" with a literal in Python 3.8 |
38 |
+ |
39 |
+diff --git a/pithos/SearchDialog.py b/pithos/SearchDialog.py |
40 |
+index d8eec14..fcc9004 100644 |
41 |
+--- a/pithos/SearchDialog.py |
42 |
++++ b/pithos/SearchDialog.py |
43 |
+@@ -61,11 +61,11 @@ class SearchDialog(Gtk.Dialog): |
44 |
+ return |
45 |
+ |
46 |
+ for i in results: |
47 |
+- if i.resultType is 'song': |
48 |
++ if i.resultType == 'song': |
49 |
+ mk = '<b>{}</b> by {}'.format(html.escape(i.title), html.escape(i.artist)) |
50 |
+- elif i.resultType is 'artist': |
51 |
++ elif i.resultType == 'artist': |
52 |
+ mk = '<b>{}</b> (artist)'.format(html.escape(i.name)) |
53 |
+- elif i.resultType is 'genre': |
54 |
++ elif i.resultType == 'genre': |
55 |
+ mk = '<b>{}</b> (genre)'.format(html.escape(i.stationName)) |
56 |
+ self.model.append((i, mk)) |
57 |
+ self.treeview.show() |
58 |
+diff --git a/pithos/StationsDialog.py b/pithos/StationsDialog.py |
59 |
+index a2b51b2..43cdcb6 100644 |
60 |
+--- a/pithos/StationsDialog.py |
61 |
++++ b/pithos/StationsDialog.py |
62 |
+@@ -201,9 +201,9 @@ class StationsDialog(Gtk.Dialog): |
63 |
+ def add_station_cb(self, dialog, response): |
64 |
+ result = dialog.result |
65 |
+ if result is not None: |
66 |
+- if result.resultType is 'song': |
67 |
++ if result.resultType == 'song': |
68 |
+ description = '{} by {}'.format(html.escape(result.title), html.escape(result.artist)) |
69 |
+- elif result.resultType is 'artist': |
70 |
++ elif result.resultType == 'artist': |
71 |
+ description = html.escape(result.name) |
72 |
+ else: |
73 |
+ description = html.escape(result.stationName) |
74 |
|
75 |
diff --git a/media-sound/pithos/files/pithos-1.5.0-tests.patch b/media-sound/pithos/files/pithos-1.5.0-tests.patch |
76 |
new file mode 100644 |
77 |
index 00000000000..cab7639772e |
78 |
--- /dev/null |
79 |
+++ b/media-sound/pithos/files/pithos-1.5.0-tests.patch |
80 |
@@ -0,0 +1,23 @@ |
81 |
+diff --git a/data/meson.build b/data/meson.build |
82 |
+index efac217..d08796a 100644 |
83 |
+--- a/data/meson.build |
84 |
++++ b/data/meson.build |
85 |
+@@ -41,12 +41,12 @@ pithos_appstream = i18n.merge_file( |
86 |
+ |
87 |
+ pithos_settings = gnome.compile_schemas() |
88 |
+ |
89 |
+-appstream_util = find_program('appstream-util', required: false) |
90 |
+-if appstream_util.found() |
91 |
+- test('Validate appstream file', appstream_util, |
92 |
+- args: ['validate', pithos_appstream] |
93 |
+- ) |
94 |
+-endif |
95 |
++#appstream_util = find_program('appstream-util', required: false) |
96 |
++#if appstream_util.found() |
97 |
++# test('Validate appstream file', appstream_util, |
98 |
++# args: ['validate', pithos_appstream] |
99 |
++# ) |
100 |
++#endif |
101 |
+ |
102 |
+ desktop_utils = find_program('desktop-file-validate', required: false) |
103 |
+ if desktop_utils.found() |
104 |
|
105 |
diff --git a/media-sound/pithos/pithos-1.5.0.ebuild b/media-sound/pithos/pithos-1.5.0.ebuild |
106 |
new file mode 100644 |
107 |
index 00000000000..11ebd44dac4 |
108 |
--- /dev/null |
109 |
+++ b/media-sound/pithos/pithos-1.5.0.ebuild |
110 |
@@ -0,0 +1,78 @@ |
111 |
+# Copyright 1999-2020 Gentoo Authors |
112 |
+# Distributed under the terms of the GNU General Public License v2 |
113 |
+ |
114 |
+EAPI=7 |
115 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
116 |
+inherit meson gnome2-utils virtualx python-r1 |
117 |
+ |
118 |
+if [[ ${PV} =~ [9]{4,} ]]; then |
119 |
+ inherit git-r3 |
120 |
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
121 |
+else |
122 |
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
123 |
+fi |
124 |
+ |
125 |
+DESCRIPTION="Pandora.com client for the GNOME desktop" |
126 |
+HOMEPAGE="https://pithos.github.io/" |
127 |
+ |
128 |
+LICENSE="GPL-3" |
129 |
+SLOT="0" |
130 |
+KEYWORDS="~amd64" |
131 |
+IUSE="appindicator +keybinder libnotify test" |
132 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
133 |
+ |
134 |
+RDEPEND="${PYTHON_DEPS} |
135 |
+ dev-python/pygobject[${PYTHON_USEDEP}] |
136 |
+ app-crypt/libsecret[introspection] |
137 |
+ dev-libs/appstream-glib[introspection] |
138 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
139 |
+ dev-python/pylast[${PYTHON_USEDEP}] |
140 |
+ media-libs/gstreamer:1.0[introspection] |
141 |
+ media-plugins/gst-plugins-meta:1.0[aac,http,mp3] |
142 |
+ x11-libs/gtk+:3[introspection] |
143 |
+ x11-libs/pango[introspection] |
144 |
+ x11-themes/gnome-icon-theme-symbolic |
145 |
+ appindicator? ( dev-libs/libappindicator:3[introspection] ) |
146 |
+ keybinder? ( dev-libs/keybinder:3[introspection] ) |
147 |
+ libnotify? ( x11-libs/libnotify[introspection] ) |
148 |
+" |
149 |
+BDEPEND=" |
150 |
+ virtual/pkgconfig |
151 |
+ test? ( |
152 |
+ ${RDEPEND} |
153 |
+ dev-libs/glib:2 |
154 |
+ dev-util/desktop-file-utils |
155 |
+ ) |
156 |
+" |
157 |
+ |
158 |
+PATCHES=( |
159 |
+ "${FILESDIR}/pithos-1.5.0-py38.patch" |
160 |
+ |
161 |
+ # comment out tests that need internet |
162 |
+ "${FILESDIR}/pithos-1.5.0-tests.patch" |
163 |
+) |
164 |
+ |
165 |
+src_configure() { |
166 |
+ python_foreach_impl meson_src_configure |
167 |
+} |
168 |
+ |
169 |
+src_compile() { |
170 |
+ python_foreach_impl meson_src_compile |
171 |
+} |
172 |
+ |
173 |
+src_test() { |
174 |
+ virtx python_foreach_impl meson_src_test |
175 |
+} |
176 |
+ |
177 |
+src_install() { |
178 |
+ python_foreach_impl meson_src_install |
179 |
+ einstalldocs |
180 |
+} |
181 |
+ |
182 |
+pkg_postinst() { |
183 |
+ gnome2_schemas_update |
184 |
+} |
185 |
+ |
186 |
+pkg_postrm() { |
187 |
+ gnome2_schemas_update |
188 |
+} |