diff options
author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-19 16:07:16 +0800 |
---|---|---|
committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-10-19 16:07:16 +0800 |
commit | a4b40280c884b9c6e38fddac457cb6650f577449 (patch) | |
tree | dfc9b728da7a5785a0210f689d723a890acdd16c /audio | |
parent | 19a38930b11911ebe88e27498fb4042ea826b684 (diff) | |
download | marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar.gz marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar.bz2 marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar.lz marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar.xz marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.tar.zst marcuscom-ports-a4b40280c884b9c6e38fddac457cb6650f577449.zip |
Update gnome-{devel-docs,music,weather} to 3.14.1
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19994 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
-rw-r--r-- | audio/gnome-music/Makefile | 6 | ||||
-rw-r--r-- | audio/gnome-music/distinfo | 4 | ||||
-rw-r--r-- | audio/gnome-music/files/patch-gnomemusic_grilo.py | 30 | ||||
-rw-r--r-- | audio/gnome-music/files/patch-gnomemusic_view.py | 87 | ||||
-rw-r--r-- | audio/gnome-music/files/patch-gnomemusic_widget.py | 29 | ||||
-rw-r--r-- | audio/gnome-music/files/patch-gnomemusic_window.py | 52 | ||||
-rw-r--r-- | audio/gnome-music/pkg-plist | 84 |
7 files changed, 53 insertions, 239 deletions
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile index 960017d4b..04dbb835a 100644 --- a/audio/gnome-music/Makefile +++ b/audio/gnome-music/Makefile @@ -3,8 +3,7 @@ # $MCom$ PORTNAME= gnome-music -PORTVERSION= 3.12.2.1 -PORTREVISION= 3 +PORTVERSION= 3.14.0 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,7 +12,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME music playing application BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -LIB_DEPENDS= libgrilo-0.2.so:${PORTSDIR}/net/grilo +LIB_DEPENDS= libgrilo-0.2.so:${PORTSDIR}/net/grilo \ + libmediaart-1.0.so:${PORTSDIR}/multimedia/libmediaart USES= gettext gmake libtool pathfix pkgconfig \ python:3 tar:xz diff --git a/audio/gnome-music/distinfo b/audio/gnome-music/distinfo index 5a1326ce0..1799cc51b 100644 --- a/audio/gnome-music/distinfo +++ b/audio/gnome-music/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gnome-music-3.12.2.1.tar.xz) = 9f0c99283853f054e3c5b4ad15df1e8fe3ac07bc046ac0f019ef0600ca969fef -SIZE (gnome3/gnome-music-3.12.2.1.tar.xz) = 1423164 +SHA256 (gnome3/gnome-music-3.14.0.tar.xz) = 1eb88cf564f276c64ead4751da2f821d0bf2a3380a790d6497f32d1a12f180ed +SIZE (gnome3/gnome-music-3.14.0.tar.xz) = 1461712 diff --git a/audio/gnome-music/files/patch-gnomemusic_grilo.py b/audio/gnome-music/files/patch-gnomemusic_grilo.py deleted file mode 100644 index 7a0125093..000000000 --- a/audio/gnome-music/files/patch-gnomemusic_grilo.py +++ /dev/null @@ -1,30 +0,0 @@ -From e357c1fcda9ed1404137f1f941a63c50767250cc Mon Sep 17 00:00:00 2001 -From: Sai Suman Prayaga <suman.sai14@gmail.com> -Date: Thu, 22 May 2014 22:27:58 +0530 -Subject: Dont update in selection mode - -https://bugzilla.gnome.org/show_bug.cgi?id=726713 - -diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py -index efcea25..0de28df 100644 ---- gnomemusic/grilo.py -+++ gnomemusic/grilo.py -@@ -68,6 +68,8 @@ class Grilo(GObject.GObject): - self.tracker = None - self.changed_media_ids = [] - self.pending_event_id = 0 -+ self.changes_pending = {'Albums': False, 'Artists': False, 'Songs': False} -+ self.registry = Grl.Registry.get_default() - - self.registry = Grl.Registry.get_default() - self.registry.connect('source_added', self._on_source_added) -@@ -112,6 +114,9 @@ class Grilo(GObject.GObject): - def emit_change_signal(self): - self.changed_media_ids = [] - self.pending_event_id = 0 -+ self.changes_pending['Albums'] = True -+ self.changes_pending['Artists'] = True -+ self.changes_pending['Songs'] = True - self.emit('changes-pending') - return False - diff --git a/audio/gnome-music/files/patch-gnomemusic_view.py b/audio/gnome-music/files/patch-gnomemusic_view.py deleted file mode 100644 index 30c3644ea..000000000 --- a/audio/gnome-music/files/patch-gnomemusic_view.py +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/gnomemusic/view.py b/gnomemusic/view.py -index e2e6cd7..40f783f 100644 ---- gnomemusic/view.py -+++ gnomemusic/view.py -@@ -131,7 +131,6 @@ class ViewContainer(Stack): - box.pack_end(self._loadMore.widget, False, False, 0) - self._loadMore.widget.connect('clicked', self._populate) - self.view.connect('item-activated', self._on_item_activated) -- self.view.connect('selection-mode-request', self._on_selection_mode_request) - self._cursor = None - self.header_bar = header_bar - self.header_bar._select_button.connect( -@@ -372,11 +372,17 @@ class Albums(ViewContainer): - - @log - def _on_changes_pending(self, data=None): -- if (self._init): -+ if (self._init and self.header_bar._selectionMode is False): - self._offset = 0 - self._cached_count = -1 - self._model.clear() - self.populate() -+ grilo.changes_pending['Albums'] = False -+ -+ @log -+ def _on_selection_mode_changed(self, widget, data=None): -+ if self.header_bar._selectionMode is False and grilo.changes_pending['Albums'] is True: -+ self._on_changes_pending() - - @log - def _back_button_clicked(self, widget, data=None): -@@ -459,11 +465,17 @@ class Songs(ViewContainer): - - @log - def _on_changes_pending(self, data=None): -- if (self._init): -+ if (self._init and self.header_bar._selectionMode is False): - self._model.clear() - self._offset = 0 - self._cached_count = -1 - self.populate() -+ grilo.changes_pending['Songs'] = False -+ -+ @log -+ def _on_selection_mode_changed(self, widget, data=None): -+ if self.header_bar._selectionMode is False and grilo.changes_pending['Songs'] is True: -+ self._on_changes_pending() - - @log - def _on_item_activated(self, widget, id, path): -@@ -646,12 +658,13 @@ class Artists (ViewContainer): - - @log - def _on_changes_pending(self, data=None): -- if (self._init): -+ if (self._init and self.header_bar._selectionMode is False): - self._model.clear() - self._artists.clear() - self._offset = 0 - self._cached_count = -1 - self._populate() -+ grilo.changes_pending['Artists'] = False - - @log - def _populate(self, data=None): -@@ -763,6 +776,12 @@ class Artists (ViewContainer): - self._last_selection) - - @log -+ def _on_selection_mode_changed(self, widget, data=None): -+ self.artistAlbumsStack.set_sensitive(not self.header_bar._selectionMode) -+ if self.header_bar._selectionMode is False and grilo.changes_pending['Artists'] is True: -+ self._on_changes_pending() -+ -+ @log - def get_selected_track_uris(self, callback): - self.items_selected = [] - self.items_selected_callback = callback -@@ -1089,6 +1108,7 @@ class Playlist(ViewContainer): - self.playlists_sidebar.set_sensitive(not self.header_bar._selectionMode) - self.menubutton.set_sensitive(not self.header_bar._selectionMode) - -+ - @log - def _on_play_activate(self, menuitem, data=None): - _iter = self._model.get_iter_first() - diff --git a/audio/gnome-music/files/patch-gnomemusic_widget.py b/audio/gnome-music/files/patch-gnomemusic_widget.py deleted file mode 100644 index 21610eed4..000000000 --- a/audio/gnome-music/files/patch-gnomemusic_widget.py +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/gnomemusic/widgets.py b/gnomemusic/widgets.py -index ee5835d..81c48c3 100644 ---- gnomemusic/widgets.py -+++ gnomemusic/widgets.py -@@ -140,11 +140,13 @@ class AlbumWidget(Gtk.EventBox): - ) - self.view.set_view_type(Gd.MainViewType.LIST) - self.album = None -+ self.header_bar = None - self.view.connect('item-activated', self._on_item_activated) - self.monitors = [] - view_box = self.ui.get_object('view') - self.ui.get_object('scrolledWindow').set_placement(Gtk.CornerType. - TOP_LEFT) -+ self.view.connect('selection-mode-request', self._on_selection_mode_request) - child_view = self.view.get_children()[0] - child_view.set_margin_top(64) - child_view.set_margin_bottom(64) -@@ -159,6 +161,10 @@ class AlbumWidget(Gtk.EventBox): - self.show_all() - - @log -+ def _on_selection_mode_request(self, *args): -+ self.header_bar._select_button.clicked() -+ -+ @log - def _on_item_activated(self, widget, id, path): - child_path = self.filter.convert_path_to_child_path(path) - _iter = self.model.get_iter(child_path) diff --git a/audio/gnome-music/files/patch-gnomemusic_window.py b/audio/gnome-music/files/patch-gnomemusic_window.py deleted file mode 100644 index c2503a6ed..000000000 --- a/audio/gnome-music/files/patch-gnomemusic_window.py +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/gnomemusic/window.py b/gnomemusic/window.py -index 33c49b9..fc59150 100644 ---- gnomemusic/window.py -+++ gnomemusic/window.py -@@ -116,17 +116,17 @@ class Window(Gtk.ApplicationWindow): - if cursor is not None and cursor.next(None): - count = cursor.get_integer(0) - if not count > 0: -- print("switching to Empty view") -- self._stack.disconnect(self._on_notify_model_id) -- self.disconnect(self._key_press_event_id) -- for i in range(0, 4): -- view = self.views.pop() -- view.destroy() -- self.toolbar.hide_stack() -- self._switch_to_empty_view() -+ if self.toolbar._selectionMode is False and len(self.views) != 1: -+ self._stack.disconnect(self._on_notify_model_id) -+ self.disconnect(self._key_press_event_id) -+ view_count = len(self.views) -+ for i in range(0, view_count): -+ view = self.views.pop() -+ view.destroy() -+ self.toolbar.hide_stack() -+ self._switch_to_empty_view() - else: - if (self.views[0] == self.views[-1]): -- print("switching to player view") - view = self.views.pop() - view.destroy() - self._switch_to_player_view() -@@ -207,7 +207,8 @@ class Window(Gtk.ApplicationWindow): - self._switch_to_player_view() - # To revert to the No Music View when no songs are found - else: -- self._switch_to_empty_view() -+ if self.toolbar._selectionMode is False: -+ self._switch_to_empty_view() - - self.toolbar._search_button.connect('toggled', self._on_search_toggled) - self.toolbar.connect('selection-mode-changed', self._on_selection_mode_changed) -@@ -340,7 +341,9 @@ class Window(Gtk.ApplicationWindow): - - @log - def _on_selection_mode_changed(self, widget, data=None): -- if self.toolbar._selectionMode: -+ if self.toolbar._selectionMode is False: -+ self._on_changes_pending() -+ else: - in_playlist = self._stack.get_visible_child() == self.views[3] - self.selection_toolbar._add_to_playlist_button.set_visible(not in_playlist) - self.selection_toolbar._remove_from_playlist_button.set_visible(in_playlist) diff --git a/audio/gnome-music/pkg-plist b/audio/gnome-music/pkg-plist index d0cef7882..42050be2f 100644 --- a/audio/gnome-music/pkg-plist +++ b/audio/gnome-music/pkg-plist @@ -43,6 +43,7 @@ lib/gnome-music/girepository-1.0/Gd-1.0.typelib %%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/widgets.cpython-33.pyo %%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-33.pyc %%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__/window.cpython-33.pyo +man/man1/gnome-music.1.gz share/appdata/gnome-music.appdata.xml share/applications/gnome-music.desktop %%DATADIR%%/gnome-music.gresource @@ -73,19 +74,6 @@ share/help/cs/gnome-music/playlist-repeat.page share/help/cs/gnome-music/playlist-shuffle.page share/help/cs/gnome-music/search.page share/help/cs/gnome-music/figures/gnome-music-3.12.png -share/help/de/gnome-music/index.page -share/help/de/gnome-music/introduction.page -share/help/de/gnome-music/legal.xml -share/help/de/gnome-music/play-music.page -share/help/de/gnome-music/playlist-create-albums.page -share/help/de/gnome-music/playlist-create-artists.page -share/help/de/gnome-music/playlist-create-songs.page -share/help/de/gnome-music/playlist-delete.page -share/help/de/gnome-music/playlist-remove-songs.page -share/help/de/gnome-music/playlist-repeat.page -share/help/de/gnome-music/playlist-shuffle.page -share/help/de/gnome-music/search.page -share/help/de/gnome-music/figures/gnome-music-3.12.png share/help/el/gnome-music/index.page share/help/el/gnome-music/introduction.page share/help/el/gnome-music/legal.xml @@ -125,6 +113,19 @@ share/help/fr/gnome-music/playlist-repeat.page share/help/fr/gnome-music/playlist-shuffle.page share/help/fr/gnome-music/search.page share/help/fr/gnome-music/figures/gnome-music-3.12.png +share/help/gl/gnome-music/figures/gnome-music-3.12.png +share/help/gl/gnome-music/index.page +share/help/gl/gnome-music/introduction.page +share/help/gl/gnome-music/legal.xml +share/help/gl/gnome-music/play-music.page +share/help/gl/gnome-music/playlist-create-albums.page +share/help/gl/gnome-music/playlist-create-artists.page +share/help/gl/gnome-music/playlist-create-songs.page +share/help/gl/gnome-music/playlist-delete.page +share/help/gl/gnome-music/playlist-remove-songs.page +share/help/gl/gnome-music/playlist-repeat.page +share/help/gl/gnome-music/playlist-shuffle.page +share/help/gl/gnome-music/search.page share/help/hu/gnome-music/index.page share/help/hu/gnome-music/introduction.page share/help/hu/gnome-music/legal.xml @@ -138,6 +139,19 @@ share/help/hu/gnome-music/playlist-repeat.page share/help/hu/gnome-music/playlist-shuffle.page share/help/hu/gnome-music/search.page share/help/hu/gnome-music/figures/gnome-music-3.12.png +share/help/ko/gnome-music/figures/gnome-music-3.12.png +share/help/ko/gnome-music/index.page +share/help/ko/gnome-music/introduction.page +share/help/ko/gnome-music/legal.xml +share/help/ko/gnome-music/play-music.page +share/help/ko/gnome-music/playlist-create-albums.page +share/help/ko/gnome-music/playlist-create-artists.page +share/help/ko/gnome-music/playlist-create-songs.page +share/help/ko/gnome-music/playlist-delete.page +share/help/ko/gnome-music/playlist-remove-songs.page +share/help/ko/gnome-music/playlist-repeat.page +share/help/ko/gnome-music/playlist-shuffle.page +share/help/ko/gnome-music/search.page share/help/pt_BR/gnome-music/index.page share/help/pt_BR/gnome-music/introduction.page share/help/pt_BR/gnome-music/legal.xml @@ -151,6 +165,24 @@ share/help/pt_BR/gnome-music/playlist-repeat.page share/help/pt_BR/gnome-music/playlist-shuffle.page share/help/pt_BR/gnome-music/search.page share/help/pt_BR/gnome-music/figures/gnome-music-3.12.png +share/help/ro/gnome-music/figures/gnome-music-3.12.png +share/help/ro/gnome-music/index.page +share/help/ro/gnome-music/introduction.page +share/help/ro/gnome-music/legal.xml +share/help/ro/gnome-music/play-music.page +share/help/ro/gnome-music/playlist-create-albums.page +share/help/ro/gnome-music/playlist-create-artists.page +share/help/ro/gnome-music/playlist-create-songs.page +share/help/ro/gnome-music/playlist-delete.page +share/help/ro/gnome-music/playlist-remove-songs.page +share/help/ro/gnome-music/playlist-repeat.page +share/help/ro/gnome-music/playlist-shuffle.page +share/help/ro/gnome-music/search.page +share/icons/HighContrast/16x16/apps/gnome-music.png +share/icons/HighContrast/22x22/apps/gnome-music.png +share/icons/HighContrast/256x256/apps/gnome-music.png +share/icons/HighContrast/32x32/apps/gnome-music.png +share/icons/HighContrast/48x48/apps/gnome-music.png share/icons/hicolor/16x16/apps/gnome-music.png share/icons/hicolor/22x22/apps/gnome-music.png share/icons/hicolor/256x256/apps/gnome-music.png @@ -158,6 +190,7 @@ share/icons/hicolor/32x32/apps/gnome-music.png share/icons/hicolor/48x48/apps/gnome-music.png share/locale/af/LC_MESSAGES/gnome-music.mo share/locale/an/LC_MESSAGES/gnome-music.mo +share/locale/ar/LC_MESSAGES/gnome-music.mo share/locale/as/LC_MESSAGES/gnome-music.mo share/locale/be/LC_MESSAGES/gnome-music.mo share/locale/ca/LC_MESSAGES/gnome-music.mo @@ -187,11 +220,13 @@ share/locale/lt/LC_MESSAGES/gnome-music.mo share/locale/lv/LC_MESSAGES/gnome-music.mo share/locale/ml/LC_MESSAGES/gnome-music.mo share/locale/nb/LC_MESSAGES/gnome-music.mo +share/locale/ne/LC_MESSAGES/gnome-music.mo share/locale/nl/LC_MESSAGES/gnome-music.mo share/locale/pa/LC_MESSAGES/gnome-music.mo share/locale/pl/LC_MESSAGES/gnome-music.mo share/locale/pt/LC_MESSAGES/gnome-music.mo share/locale/pt_BR/LC_MESSAGES/gnome-music.mo +share/locale/ro/LC_MESSAGES/gnome-music.mo share/locale/ru/LC_MESSAGES/gnome-music.mo share/locale/sk/LC_MESSAGES/gnome-music.mo share/locale/sl/LC_MESSAGES/gnome-music.mo @@ -205,26 +240,3 @@ share/locale/uk/LC_MESSAGES/gnome-music.mo share/locale/zh_CN/LC_MESSAGES/gnome-music.mo share/locale/zh_HK/LC_MESSAGES/gnome-music.mo share/locale/zh_TW/LC_MESSAGES/gnome-music.mo -@dirrm share/help/pt_BR/gnome-music/figures -@dirrm share/help/pt_BR/gnome-music -@dirrm share/help/hu/gnome-music/figures -@dirrm share/help/hu/gnome-music -@dirrm share/help/fr/gnome-music/figures -@dirrm share/help/fr/gnome-music -@dirrm share/help/es/gnome-music/figures -@dirrm share/help/es/gnome-music -@dirrm share/help/el/gnome-music/figures -@dirrm share/help/el/gnome-music -@dirrm share/help/de/gnome-music/figures -@dirrm share/help/de/gnome-music -@dirrm share/help/cs/gnome-music/figures -@dirrm share/help/cs/gnome-music -@dirrm share/help/C/gnome-music/figures -@dirrm share/help/C/gnome-music -@dirrmtry share/appdata -@dirrm lib/gnome-music/girepository-1.0 -@dirrm lib/gnome-music -@dirrm %%PYTHON_SITELIBDIR%%/gnomemusic/__pycache__ -@dirrm %%PYTHON_SITELIBDIR%%/gnomemusic -@dirrm %%DATADIR%%/gir-1.0 -@dirrm %%DATADIR%% |