On 07/04/14 14:23, Brian Callahan wrote:
Hi ports --
Attached is an update for audio/pithos. It's a rather major update:
pithos has moved from python2 to python3 and from gstreamer-0.10 to
gstreamer1.
This requires the new port x11/keybinder3 that I posted to ports@ a
few days ago.
Note for those who have a free Pandora account: when pithos encounters
an ad, it goes into a loop where the ad is silent and pithos
continually tries to load the ad over and over. This also affects the
current version in ports. Upstream is aware of the problem and is
unlikely to fix it, claiming that the only proper fix is to purchase a
paid Pandora account which has no ads. Using a paid account has no
issues.
OK?
~Brian
Better diff attached.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/pithos/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 16 Jan 2014 07:09:05 -0000 1.3
+++ Makefile 8 Jul 2014 05:43:46 -0000
@@ -1,37 +1,39 @@
# $OpenBSD: Makefile,v 1.3 2014/01/16 07:09:05 bcallah Exp $
-GH_VER = 0.3.18
+GH_VER = 1.0.0
COMMENT = Pandora client for GNOME
DISTNAME = pithos-${GH_VER}
-REVISION = 1
DISTFILES = ${DISTNAME}{${GH_VER}}${EXTRACT_SUFX}
CATEGORIES = audio x11
+SUBST_VARS += GH_VER
HOMEPAGE = http://pithos.github.io/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# Github page says GPLv3+
# But the code says GPLv3 only
+# pithos/pandora/blowfish.py: AGPLv3+
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = https://github.com/pithos/pithos/archive/
MODULES = lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = audio/py-last>=0.5.11 \
+RUN_DEPENDS = audio/py-last${MODPY_FLAVOR}>=0.5.11 \
devel/desktop-file-utils \
- devel/py-notify \
- devel/py-xdg \
- multimedia/gstreamer-0.10/plugins-good \
- multimedia/gstreamer-0.10/plugins-ffmpeg \
- multimedia/gstreamer-0.10/py-gstreamer \
- x11/dbus-python \
- x11/gtk+2,-guic \
- x11/keybinder,-python \
- x11/py-gtk2
+ devel/libnotify \
+ devel/py-gobject3${MODPY_FLAVOR} \
+ devel/py-xdg${MODPY_FLAVOR} \
+ multimedia/gstreamer1/plugins-good \
+ multimedia/gstreamer1/plugins-bad \
+ multimedia/gstreamer1/plugins-libav \
+ x11/dbus-python${MODPY_FLAVOR} \
+ x11/keybinder3 \
+ x11/gtk+2,-guic
-TEST_DEPENDS = audio/py-last>=0.5.11
+TEST_DEPENDS = audio/py-last${MODPY_FLAVOR}>=0.5.11
post-patch:
perl -pi -e "s,/usr/s,s,g" ${WRKSRC}/setup.py
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/pithos/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 15 Jan 2014 01:52:59 -0000 1.1.1.1
+++ distinfo 8 Jul 2014 05:43:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (pithos-0.3.18.tar.gz) = 3BhHhSWPuivTOJDrsWRma0Av8QAbgnAhoYH2rw3bhRE=
-SIZE (pithos-0.3.18.tar.gz) = 115195
+SHA256 (pithos-1.0.0.tar.gz) = ys0aCemE/YPE6fOPpB/rCZCYHg/RTXuMZOmc/ylKkYQ=
+SIZE (pithos-1.0.0.tar.gz) = 107108
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/pithos/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 15 Jan 2014 01:52:59 -0000 1.1.1.1
+++ pkg/PLIST 8 Jul 2014 05:43:46 -0000
@@ -1,29 +1,37 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/01/15 01:52:59 bcallah Exp $
bin/pithos
lib/python${MODPY_VERSION}/site-packages/pithos/
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pithos-0.3-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/pithos-${GH_VER}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pithos/AboutPithosDialog.py
-lib/python${MODPY_VERSION}/site-packages/pithos/AboutPithosDialog.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/PreferencesPithosDialog.py
-lib/python${MODPY_VERSION}/site-packages/pithos/PreferencesPithosDialog.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/SearchDialog.py
-lib/python${MODPY_VERSION}/site-packages/pithos/SearchDialog.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/StationsDialog.py
-lib/python${MODPY_VERSION}/site-packages/pithos/StationsDialog.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pithos/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}AboutPithosDialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}PreferencesPithosDialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}SearchDialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}StationsDialog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}dbus_service.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}gobject_worker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}mpris.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}pithos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}pithosconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pithos/data/
lib/python${MODPY_VERSION}/site-packages/pithos/data/media/
lib/python${MODPY_VERSION}/site-packages/pithos/data/media/album_default.png
lib/python${MODPY_VERSION}/site-packages/pithos/data/media/album_default.svg
-lib/python${MODPY_VERSION}/site-packages/pithos/data/media/icon.png
-lib/python${MODPY_VERSION}/site-packages/pithos/data/media/pithos-mono.png
+lib/python${MODPY_VERSION}/site-packages/pithos/data/media/icon.svg
+lib/python${MODPY_VERSION}/site-packages/pithos/data/media/pithos-tray-icon.png
lib/python${MODPY_VERSION}/site-packages/pithos/data/media/rate_bg.png
lib/python${MODPY_VERSION}/site-packages/pithos/data/media/rate_bg.svg
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/
@@ -33,51 +41,55 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/SearchDialog.ui
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/StationsDialog.ui
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/about_pithos_dialog.xml
+lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/app_menu.ui
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/pithos_window.xml
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/preferences_pithos_dialog.xml
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/search_dialog.xml
lib/python${MODPY_VERSION}/site-packages/pithos/data/ui/stations_dialog.xml
lib/python${MODPY_VERSION}/site-packages/pithos/dbus_service.py
-lib/python${MODPY_VERSION}/site-packages/pithos/dbus_service.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/gobject_worker.py
-lib/python${MODPY_VERSION}/site-packages/pithos/gobject_worker.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/mpris.py
-lib/python${MODPY_VERSION}/site-packages/pithos/mpris.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pandora/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}blowfish.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/pandora/${MODPY_PYCACHE}pandora.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/blowfish.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pandora/blowfish.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/data.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pandora/data.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/fake.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pandora/fake.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pandora/pandora.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pandora/pandora.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pithos.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pithos.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/pithosconfig.py
-lib/python${MODPY_VERSION}/site-packages/pithos/pithosconfig.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugin.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugin.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/__init__.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}mediakeys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}notification_icon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}notify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}screensaver_pause.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pithos/plugins/${MODPY_PYCACHE}scrobble.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/mediakeys.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/mediakeys.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/notification_icon.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/notification_icon.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/notify.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/notify.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/screensaver_pause.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/screensaver_pause.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/plugins/scrobble.py
-lib/python${MODPY_VERSION}/site-packages/pithos/plugins/scrobble.pyc
lib/python${MODPY_VERSION}/site-packages/pithos/util.py
-lib/python${MODPY_VERSION}/site-packages/pithos/util.pyc
share/applications/pithos.desktop
-share/icons/hicolor/scalable/apps/pithos-mono.svg
+share/icons/hicolor/48x48/apps/pithos-tray-icon.png
share/icons/hicolor/scalable/apps/pithos.svg
+share/icons/ubuntu-mono-dark/
+share/icons/ubuntu-mono-dark/apps/
+share/icons/ubuntu-mono-dark/apps/16/
+share/icons/ubuntu-mono-dark/apps/16/pithos-tray-icon.svg
+share/icons/ubuntu-mono-light/
+share/icons/ubuntu-mono-light/apps/
+share/icons/ubuntu-mono-light/apps/16/
+share/icons/ubuntu-mono-light/apps/16/pithos-tray-icon.svg
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
