4 files changed, 82 insertions, 14 deletions

diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index 98847d8df4f9..b4d8ca686369 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lollypop
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.11
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/gnumdk/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/download/${PORTVERSION}
@@ -13,17 +13,16 @@ COMMENT=	Play and organize your music collection
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.26:${PORTSDIR}/audio/py-mutagen \
-	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:${PORTSDIR}/databases/py-sqlite3 \
-	${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:${PORTSDIR}/devel/py3-dbus
+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
-RUN_DEPENDS=	gnome-icon-theme>=3.6.2:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic
 
 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
+USE_GSTREAMER1=	yes mad ogg flac opus libav faad good speex
 USE_PYTHON=	py3kplist
 INSTALLS_ICONS=	yes
 
diff --git a/audio/lollypop/distinfo b/audio/lollypop/distinfo
index 106af5342650..64e61c026c2a 100644
--- a/audio/lollypop/distinfo
+++ b/audio/lollypop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lollypop-0.9.5.tar.xz) = 20e2ac4331691c64feeaccd89fd19e326c8bfa755191b9ddf4ff5b320e2a7207
-SIZE (lollypop-0.9.5.tar.xz) = 364396
+SHA256 (lollypop-0.9.11.tar.xz) = 5ec85d3a860cb3e360a3bf6e94d1d544f8001af7bb26f47435653376ee3f7c64
+SIZE (lollypop-0.9.11.tar.xz) = 375140
diff --git a/audio/lollypop/files/patch-src_application.py b/audio/lollypop/files/patch-src_application.py
new file mode 100644
index 000000000000..bcdd0fde1c26
--- /dev/null
+++ b/audio/lollypop/files/patch-src_application.py
@@ -0,0 +1,63 @@
+--- src/application.py.orig	2015-04-17 13:26:29 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 <http://www.gnu.org/licenses/>.
+ 
+-from gi.repository import Gtk, Gio, GLib, Gdk, Notify, TotemPlParser
++from gi.repository import Gtk, Gio, GLib, Gdk, Notify
+ from locale import getlocale
+ 
+ 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
diff --git a/audio/lollypop/pkg-plist b/audio/lollypop/pkg-plist
index 45d3ebb8c722..d32f1ed6daff 100644
--- a/audio/lollypop/pkg-plist
+++ b/audio/lollypop/pkg-plist
@@ -1,4 +1,7 @@
 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
@@ -8,6 +11,9 @@ bin/lollypop
 %%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
@@ -23,9 +29,6 @@ bin/lollypop
 %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.py
 %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyc
 %%PYTHON_SITELIBDIR%%/lollypop/database_tracks.pyo
-%%PYTHON_SITELIBDIR%%/lollypop/database_upgrade.py
-%%PYTHON_SITELIBDIR%%/lollypop/database_upgrade.pyc
-%%PYTHON_SITELIBDIR%%/lollypop/database_upgrade.pyo
 %%PYTHON_SITELIBDIR%%/lollypop/devicemanager.py
 %%PYTHON_SITELIBDIR%%/lollypop/devicemanager.pyc
 %%PYTHON_SITELIBDIR%%/lollypop/devicemanager.pyo
@@ -44,6 +47,9 @@ bin/lollypop
 %%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/playlists.py
 %%PYTHON_SITELIBDIR%%/lollypop/playlists.pyc
 %%PYTHON_SITELIBDIR%%/lollypop/playlists.pyo
@@ -80,9 +86,6 @@ bin/lollypop
 %%PYTHON_SITELIBDIR%%/lollypop/view.py
 %%PYTHON_SITELIBDIR%%/lollypop/view.pyc
 %%PYTHON_SITELIBDIR%%/lollypop/view.pyo
-%%PYTHON_SITELIBDIR%%/lollypop/view_widgets.py
-%%PYTHON_SITELIBDIR%%/lollypop/view_widgets.pyc
-%%PYTHON_SITELIBDIR%%/lollypop/view_widgets.pyo
 %%PYTHON_SITELIBDIR%%/lollypop/window.py
 %%PYTHON_SITELIBDIR%%/lollypop/window.pyc
 %%PYTHON_SITELIBDIR%%/lollypop/window.pyo
@@ -99,7 +102,10 @@ 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/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
 %%DATADIR%%/lollypop.gresource