Index: head/audio/lollypop/Makefile =================================================================== --- head/audio/lollypop/Makefile (revision 385053) +++ head/audio/lollypop/Makefile (revision 385054) @@ -1,47 +1,48 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= lollypop -PORTVERSION= 0.9.11 +PORTVERSION= 0.9.15 CATEGORIES= audio MASTER_SITES= https://github.com/gnumdk/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME}/releases/download/${PORTVERSION} MAINTAINER= olivierd@FreeBSD.org COMMENT= Play and organize your music collection LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:${PORTSDIR}/devel/py3-dbus \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:${PORTSDIR}/multimedia/py3-gstreamer1 -LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ + libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser USES= shebangfix python:3 pkgconfig gettext gmake tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 py3gobject3 introspection:build intltool intlhack USE_SQLITE= yes USE_GSTREAMER1= yes mad ogg flac opus libav faad good speex USE_PYTHON= py3kplist INSTALLS_ICONS= yes SHEBANG_FILES= src/*.py SHEBANG_LANG= python python_OLD_CMD= /usr/bin/python python_CMD= ${PYTHON_CMD} GLIB_SCHEMAS= org.gnome.Lollypop.gschema.xml OPTIONS_DEFINE= PULSEAUDIO PULSEAUDIO_USE= gstreamer1=pulse SUB_FILES= pkg-message .include .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif .include Index: head/audio/lollypop/distinfo =================================================================== --- head/audio/lollypop/distinfo (revision 385053) +++ head/audio/lollypop/distinfo (revision 385054) @@ -1,2 +1,2 @@ -SHA256 (lollypop-0.9.11.tar.xz) = 5ec85d3a860cb3e360a3bf6e94d1d544f8001af7bb26f47435653376ee3f7c64 -SIZE (lollypop-0.9.11.tar.xz) = 375140 +SHA256 (lollypop-0.9.15.tar.xz) = 7d86463fe229cecc779db3db98f720dbb1b8ee97144fb7f7e242650c510bc960 +SIZE (lollypop-0.9.15.tar.xz) = 397220 Index: head/audio/lollypop/files/patch-src_application.py =================================================================== --- head/audio/lollypop/files/patch-src_application.py (revision 385053) +++ head/audio/lollypop/files/patch-src_application.py (revision 385054) @@ -1,63 +1,10 @@ ---- src/application.py.orig 2015-04-17 13:26:29 UTC +--- src/application.py.orig 2015-04-30 06:37:18 UTC +++ src/application.py -@@ -11,7 +11,7 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see . +@@ -326,6 +326,7 @@ class Application(Gtk.Application): --from gi.repository import Gtk, Gio, GLib, Gdk, Notify, TotemPlParser -+from gi.repository import Gtk, Gio, GLib, Gdk, Notify - from locale import getlocale + helpAction = Gio.SimpleAction.new('help', None) + helpAction.connect('activate', self._help) ++ helpAction.set_enabled(False) + self.set_accels_for_action('app.help', ["h"]) + self.add_action(helpAction) - from lollypop.utils import is_audio, is_gnome -@@ -75,9 +75,6 @@ class Application(Gtk.Application): - dark = Objects.settings.get_value('dark-ui') - settings.set_property("gtk-application-prefer-dark-theme", dark) - -- self._parser = TotemPlParser.Parser.new() -- self._parser.connect("entry-parsed", self._on_entry_parsed) -- self._parser.connect("playlist-ended", self._on_playlist_ended) - self._parsing = 0 - - self.add_action(Objects.settings.create_action('shuffle')) -@@ -140,10 +137,7 @@ class Application(Gtk.Application): - def do_open(self, files, hint, data): - self._external_files = [] - for f in files: -- if self._parser.parse(f.get_uri(), False) ==\ -- TotemPlParser.ParserResult.SUCCESS: -- self._parsing += 1 -- elif is_audio(f): -+ if is_audio(f): - self._external_files.append(f.get_path()) - if not Objects.window.is_visible(): - self.do_activate() -@@ -185,29 +179,6 @@ class Application(Gtk.Application): - # PRIVATE # - ####################### - """ -- Add playlist entry to external files -- @param parser as TotemPlParser.Parser -- @param track uri as str -- @param metadata as GLib.HastTable -- """ -- def _on_entry_parsed(self, parser, uri, metadata): -- # Check if it's really a file uri -- if uri.startswith('file://'): -- self._external_files.append(GLib.filename_from_uri(uri)[0]) -- else: -- self._external_files.append(uri) -- -- """ -- Load tracks if no parsing running -- @param parser as TotemPlParser.Parser -- @param playlist uri as str -- """ -- def _on_playlist_ended(self, parser, uri): -- self._parsing -= 1 -- if self._parsing == 0: -- Objects.window.load_external(self._external_files) -- -- """ - Hide window - @param widget as Gtk.Widget - @param event as Gdk.Event Index: head/audio/lollypop/pkg-plist =================================================================== --- head/audio/lollypop/pkg-plist (revision 385053) +++ head/audio/lollypop/pkg-plist (revision 385054) @@ -1,111 +1,197 @@ bin/lollypop -%%PYTHON_SITELIBDIR%%/lollypop/album_widgets.py -%%PYTHON_SITELIBDIR%%/lollypop/album_widgets.pyc -%%PYTHON_SITELIBDIR%%/lollypop/album_widgets.pyo %%PYTHON_SITELIBDIR%%/lollypop/albumart.py %%PYTHON_SITELIBDIR%%/lollypop/albumart.pyc %%PYTHON_SITELIBDIR%%/lollypop/albumart.pyo %%PYTHON_SITELIBDIR%%/lollypop/application.py %%PYTHON_SITELIBDIR%%/lollypop/application.pyc %%PYTHON_SITELIBDIR%%/lollypop/application.pyo %%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.py %%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.pyc %%PYTHON_SITELIBDIR%%/lollypop/collectionscanner.pyo %%PYTHON_SITELIBDIR%%/lollypop/container.py %%PYTHON_SITELIBDIR%%/lollypop/container.pyc %%PYTHON_SITELIBDIR%%/lollypop/container.pyo %%PYTHON_SITELIBDIR%%/lollypop/database.py %%PYTHON_SITELIBDIR%%/lollypop/database.pyc %%PYTHON_SITELIBDIR%%/lollypop/database.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_albums.py %%PYTHON_SITELIBDIR%%/lollypop/database_albums.pyc %%PYTHON_SITELIBDIR%%/lollypop/database_albums.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_artists.py %%PYTHON_SITELIBDIR%%/lollypop/database_artists.pyc %%PYTHON_SITELIBDIR%%/lollypop/database_artists.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_genres.py %%PYTHON_SITELIBDIR%%/lollypop/database_genres.pyc %%PYTHON_SITELIBDIR%%/lollypop/database_genres.pyo %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.py %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyc %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyo -%%PYTHON_SITELIBDIR%%/lollypop/devicemanager.py -%%PYTHON_SITELIBDIR%%/lollypop/devicemanager.pyc -%%PYTHON_SITELIBDIR%%/lollypop/devicemanager.pyo %%PYTHON_SITELIBDIR%%/lollypop/define.py %%PYTHON_SITELIBDIR%%/lollypop/define.pyc %%PYTHON_SITELIBDIR%%/lollypop/define.pyo %%PYTHON_SITELIBDIR%%/lollypop/fullscreen.py %%PYTHON_SITELIBDIR%%/lollypop/fullscreen.pyc %%PYTHON_SITELIBDIR%%/lollypop/fullscreen.pyo %%PYTHON_SITELIBDIR%%/lollypop/mpris.py %%PYTHON_SITELIBDIR%%/lollypop/mpris.pyc %%PYTHON_SITELIBDIR%%/lollypop/mpris.pyo %%PYTHON_SITELIBDIR%%/lollypop/notification.py %%PYTHON_SITELIBDIR%%/lollypop/notification.pyc %%PYTHON_SITELIBDIR%%/lollypop/notification.pyo %%PYTHON_SITELIBDIR%%/lollypop/player.py %%PYTHON_SITELIBDIR%%/lollypop/player.pyc %%PYTHON_SITELIBDIR%%/lollypop/player.pyo -%%PYTHON_SITELIBDIR%%/lollypop/playlist_widgets.py -%%PYTHON_SITELIBDIR%%/lollypop/playlist_widgets.pyc -%%PYTHON_SITELIBDIR%%/lollypop/playlist_widgets.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_base.py +%%PYTHON_SITELIBDIR%%/lollypop/player_base.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_base.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_bin.py +%%PYTHON_SITELIBDIR%%/lollypop/player_bin.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_bin.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_linear.py +%%PYTHON_SITELIBDIR%%/lollypop/player_linear.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_linear.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_queue.py +%%PYTHON_SITELIBDIR%%/lollypop/player_queue.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_queue.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_rg.py +%%PYTHON_SITELIBDIR%%/lollypop/player_rg.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_rg.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.py +%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_shuffle.pyo +%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.py +%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.pyc +%%PYTHON_SITELIBDIR%%/lollypop/player_userplaylist.pyo %%PYTHON_SITELIBDIR%%/lollypop/playlists.py %%PYTHON_SITELIBDIR%%/lollypop/playlists.pyc %%PYTHON_SITELIBDIR%%/lollypop/playlists.pyo %%PYTHON_SITELIBDIR%%/lollypop/popalbums.py %%PYTHON_SITELIBDIR%%/lollypop/popalbums.pyc %%PYTHON_SITELIBDIR%%/lollypop/popalbums.pyo %%PYTHON_SITELIBDIR%%/lollypop/popimages.py %%PYTHON_SITELIBDIR%%/lollypop/popimages.pyc %%PYTHON_SITELIBDIR%%/lollypop/popimages.pyo %%PYTHON_SITELIBDIR%%/lollypop/popmenu.py %%PYTHON_SITELIBDIR%%/lollypop/popmenu.pyc %%PYTHON_SITELIBDIR%%/lollypop/popmenu.pyo %%PYTHON_SITELIBDIR%%/lollypop/queue.py %%PYTHON_SITELIBDIR%%/lollypop/queue.pyc %%PYTHON_SITELIBDIR%%/lollypop/queue.pyo %%PYTHON_SITELIBDIR%%/lollypop/search.py %%PYTHON_SITELIBDIR%%/lollypop/search.pyc %%PYTHON_SITELIBDIR%%/lollypop/search.pyo %%PYTHON_SITELIBDIR%%/lollypop/selectionlist.py %%PYTHON_SITELIBDIR%%/lollypop/selectionlist.pyc %%PYTHON_SITELIBDIR%%/lollypop/selectionlist.pyo %%PYTHON_SITELIBDIR%%/lollypop/settings.py %%PYTHON_SITELIBDIR%%/lollypop/settings.pyc %%PYTHON_SITELIBDIR%%/lollypop/settings.pyo +%%PYTHON_SITELIBDIR%%/lollypop/tagreader.py +%%PYTHON_SITELIBDIR%%/lollypop/tagreader.pyc +%%PYTHON_SITELIBDIR%%/lollypop/tagreader.pyo %%PYTHON_SITELIBDIR%%/lollypop/toolbar.py %%PYTHON_SITELIBDIR%%/lollypop/toolbar.pyc %%PYTHON_SITELIBDIR%%/lollypop/toolbar.pyo -%%PYTHON_SITELIBDIR%%/lollypop/tracks.py -%%PYTHON_SITELIBDIR%%/lollypop/tracks.pyc -%%PYTHON_SITELIBDIR%%/lollypop/tracks.pyo %%PYTHON_SITELIBDIR%%/lollypop/utils.py %%PYTHON_SITELIBDIR%%/lollypop/utils.pyc %%PYTHON_SITELIBDIR%%/lollypop/utils.pyo %%PYTHON_SITELIBDIR%%/lollypop/view.py %%PYTHON_SITELIBDIR%%/lollypop/view.pyc %%PYTHON_SITELIBDIR%%/lollypop/view.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_album.py +%%PYTHON_SITELIBDIR%%/lollypop/view_album.pyc +%%PYTHON_SITELIBDIR%%/lollypop/view_album.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_container.py +%%PYTHON_SITELIBDIR%%/lollypop/view_container.pyc +%%PYTHON_SITELIBDIR%%/lollypop/view_container.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_device.py +%%PYTHON_SITELIBDIR%%/lollypop/view_device.pyc +%%PYTHON_SITELIBDIR%%/lollypop/view_device.pyo +%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.py +%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.pyc +%%PYTHON_SITELIBDIR%%/lollypop/view_playlists.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.pyc +%%PYTHON_SITELIBDIR%%/lollypop/widgets_album.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.pyc +%%PYTHON_SITELIBDIR%%/lollypop/widgets_device.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.pyc +%%PYTHON_SITELIBDIR%%/lollypop/widgets_playlist.pyo +%%PYTHON_SITELIBDIR%%/lollypop/widgets_track.py +%%PYTHON_SITELIBDIR%%/lollypop/widgets_track.pyc +%%PYTHON_SITELIBDIR%%/lollypop/widgets_track.pyo %%PYTHON_SITELIBDIR%%/lollypop/window.py %%PYTHON_SITELIBDIR%%/lollypop/window.pyc %%PYTHON_SITELIBDIR%%/lollypop/window.pyo share/appdata/lollypop.appdata.xml share/applications/lollypop.desktop +share/help/C/lollypop/figures/lollypop-logo.png +share/help/C/lollypop/index.page +share/help/C/lollypop/legal.xml +share/help/ca/lollypop/figures/lollypop-logo.png +share/help/ca/lollypop/index.page +share/help/ca/lollypop/legal.xml +share/help/cs/lollypop/figures/lollypop-logo.png +share/help/cs/lollypop/index.page +share/help/cs/lollypop/legal.xml +share/help/de/lollypop/figures/lollypop-logo.png +share/help/de/lollypop/index.page +share/help/de/lollypop/legal.xml +share/help/es/lollypop/figures/lollypop-logo.png +share/help/es/lollypop/index.page +share/help/es/lollypop/legal.xml +share/help/fi/lollypop/figures/lollypop-logo.png +share/help/fi/lollypop/index.page +share/help/fi/lollypop/legal.xml +share/help/fr/lollypop/figures/lollypop-logo.png +share/help/fr/lollypop/index.page +share/help/fr/lollypop/legal.xml +share/help/he/lollypop/figures/lollypop-logo.png +share/help/he/lollypop/index.page +share/help/he/lollypop/legal.xml +share/help/it/lollypop/figures/lollypop-logo.png +share/help/it/lollypop/index.page +share/help/it/lollypop/legal.xml +share/help/nl/lollypop/figures/lollypop-logo.png +share/help/nl/lollypop/index.page +share/help/nl/lollypop/legal.xml +share/help/pl/lollypop/figures/lollypop-logo.png +share/help/pl/lollypop/index.page +share/help/pl/lollypop/legal.xml +share/help/pt_BR/lollypop/figures/lollypop-logo.png +share/help/pt_BR/lollypop/index.page +share/help/pt_BR/lollypop/legal.xml +share/help/ru/lollypop/figures/lollypop-logo.png +share/help/ru/lollypop/index.page +share/help/ru/lollypop/legal.xml +share/help/sk/lollypop/figures/lollypop-logo.png +share/help/sk/lollypop/index.page +share/help/sk/lollypop/legal.xml +share/help/sr/lollypop/figures/lollypop-logo.png +share/help/sr/lollypop/index.page +share/help/sr/lollypop/legal.xml +share/help/uk/lollypop/figures/lollypop-logo.png +share/help/uk/lollypop/index.page +share/help/uk/lollypop/legal.xml share/icons/hicolor/16x16/apps/lollypop.png share/icons/hicolor/22x22/apps/lollypop.png share/icons/hicolor/256x256/apps/lollypop.png share/icons/hicolor/32x32/apps/lollypop.png share/icons/hicolor/48x48/apps/lollypop.png share/locale/ca/LC_MESSAGES/lollypop.mo share/locale/cs/LC_MESSAGES/lollypop.mo share/locale/de/LC_MESSAGES/lollypop.mo share/locale/es/LC_MESSAGES/lollypop.mo -share/locale/fr/LC_MESSAGES/lollypop.mo share/locale/fi/LC_MESSAGES/lollypop.mo +share/locale/fr/LC_MESSAGES/lollypop.mo share/locale/he/LC_MESSAGES/lollypop.mo share/locale/it/LC_MESSAGES/lollypop.mo share/locale/nl/LC_MESSAGES/lollypop.mo share/locale/pl/LC_MESSAGES/lollypop.mo share/locale/pt_BR/LC_MESSAGES/lollypop.mo share/locale/sk/LC_MESSAGES/lollypop.mo +share/locale/sr/LC_MESSAGES/lollypop.mo +share/locale/uk/LC_MESSAGES/lollypop.mo %%DATADIR%%/lollypop.gresource