Hello community,
here is the log from the commit of package lollypop for openSUSE:Factory
checked in at 2019-07-11 13:16:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lollypop (Old)
and /work/SRC/openSUSE:Factory/.lollypop.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop"
Thu Jul 11 13:16:46 2019 rev:88 rq:714114 version:1.1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2019-07-08
16:32:19.284208928 +0200
+++ /work/SRC/openSUSE:Factory/.lollypop.new.4615/lollypop.changes
2019-07-11 13:16:49.370797079 +0200
@@ -1,0 +2,6 @@
+Mon Jul 08 19:01:24 UTC 2019 - antoine.belv...@opensuse.org
+
+- Update to version 1.1.4.2:
+ * Fix a crash (glgo#World/lollypop#1885).
+
+-------------------------------------------------------------------
Old:
----
lollypop-1.1.4.1.tar.xz
New:
----
lollypop-1.1.4.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lollypop.spec ++++++
--- /var/tmp/diff_new_pack.9wwC07/_old 2019-07-11 13:16:50.194796819 +0200
+++ /var/tmp/diff_new_pack.9wwC07/_new 2019-07-11 13:16:50.210796814 +0200
@@ -17,7 +17,7 @@
Name: lollypop
-Version: 1.1.4.1
+Version: 1.1.4.2
Release: 0
Summary: GNOME music playing application
License: GPL-3.0-or-later
++++++ _service ++++++
--- /var/tmp/diff_new_pack.9wwC07/_old 2019-07-11 13:16:50.282796791 +0200
+++ /var/tmp/diff_new_pack.9wwC07/_new 2019-07-11 13:16:50.286796791 +0200
@@ -1,7 +1,7 @@
<services>
<service mode="disabled" name="tar_scm">
<param name="changesgenerate">enable</param>
- <param name="revision">1.1.4.1</param>
+ <param name="revision">1.1.4.2</param>
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/World/lollypop.git</param>
<param name="versionformat">@PARENT_TAG@</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9wwC07/_old 2019-07-11 13:16:50.342796773 +0200
+++ /var/tmp/diff_new_pack.9wwC07/_new 2019-07-11 13:16:50.346796771 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/World/lollypop.git</param>
- <param
name="changesrevision">f060b2efe73af742d04ccccf50139163b2a493b5</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">1129cfad3472f1b14146173830ad7e99dda4dc0c</param></service></servicedata>
\ No newline at end of file
++++++ lollypop-1.1.4.1.tar.xz -> lollypop-1.1.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/application_actions.py
new/lollypop-1.1.4.2/lollypop/application_actions.py
--- old/lollypop-1.1.4.1/lollypop/application_actions.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/application_actions.py 2019-07-08
18:28:15.000000000 +0200
@@ -318,7 +318,7 @@
if App().player.current_track.id is not None and\
App().player.current_track.id > 0:
artist_ids = App().player.current_track.album.artist_ids
- App().window.container.show_artist_view(artist_ids)
+ App().window.container.show_artists_albums(artist_ids)
elif string == "loved":
track = App().player.current_track
if track.id is not None and track.id >= 0:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/container.py
new/lollypop-1.1.4.2/lollypop/container.py
--- old/lollypop-1.1.4.1/lollypop/container.py 2019-07-07 16:54:06.000000000
+0200
+++ new/lollypop-1.1.4.2/lollypop/container.py 2019-07-08 18:28:15.000000000
+0200
@@ -116,26 +116,28 @@
Show albums from artists
@param artist_ids as [int]
"""
- # FIXME nécessaire?
- def select_list_two(selection_list, artist_ids):
- self._list_two.select_ids(artist_ids)
- self._list_two.disconnect_by_func(select_list_two)
sidebar_content = App().settings.get_enum("sidebar-content")
- if sidebar_content == SidebarContent.GENRES:
- # Get artist genres
- genre_ids = []
- for artist_id in artist_ids:
- album_ids = App().artists.get_albums(artist_ids)
- for album_id in album_ids:
- for genre_id in App().albums.get_genre_ids(album_id):
- if genre_id not in genre_ids:
- genre_ids.append(genre_id)
- self.show_lists(genre_ids, artist_ids)
- elif sidebar_content == SidebarContent.ARTISTS:
- # Select artists on list one
- self.show_lists(artist_ids, [])
+ if App().settings.get_value("show-sidebar") and\
+ not sidebar_content == SidebarContent.DEFAULT and\
+ not App().window.is_adaptive:
+ if sidebar_content == SidebarContent.GENRES:
+ # Get artist genres
+ genre_ids = []
+ for artist_id in artist_ids:
+ album_ids = App().artists.get_albums(artist_ids)
+ for album_id in album_ids:
+ for genre_id in App().albums.get_genre_ids(album_id):
+ if genre_id not in genre_ids:
+ genre_ids.append(genre_id)
+ self.show_lists(genre_ids, artist_ids)
+ elif sidebar_content == SidebarContent.ARTISTS:
+ # Select artists on list one
+ self.show_lists(artist_ids, [])
else:
- self.show_view(artist_ids)
+ if sidebar_content == SidebarContent.DEFAULT and\
+ self._stack.get_children():
+ App().window.emit("show-can-go-back", True)
+ self.show_view([Type.ARTISTS], artist_ids)
@property
def view(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/container_views.py
new/lollypop-1.1.4.2/lollypop/container_views.py
--- old/lollypop-1.1.4.1/lollypop/container_views.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/container_views.py 2019-07-08
18:28:15.000000000 +0200
@@ -195,17 +195,6 @@
items += App().albums.get_ids([], genre_ids)
return items
- def show_artist_view(self, artist_ids):
- """
- Go to artist view
- @param artist_ids as [int]
- """
- if App().settings.get_value("show-sidebar") and\
- not App().window.is_adaptive:
- App().window.container.show_artists_albums(artist_ids)
- else:
- App().window.container.show_view(artist_ids)
-
##############
# PROTECTED #
##############
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/menu_artist.py
new/lollypop-1.1.4.2/lollypop/menu_artist.py
--- old/lollypop-1.1.4.1/lollypop/menu_artist.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/menu_artist.py 2019-07-08
18:28:15.000000000 +0200
@@ -68,4 +68,4 @@
@param Gio.SimpleAction
@param GLib.Variant
"""
- App().window.container.show_artist_view(self.__album.artist_ids)
+ App().window.container.show_artists_albums(self.__album.artist_ids)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/view_albums_list.py
new/lollypop-1.1.4.2/lollypop/view_albums_list.py
--- old/lollypop-1.1.4.1/lollypop/view_albums_list.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/view_albums_list.py 2019-07-08
18:28:15.000000000 +0200
@@ -454,7 +454,7 @@
popover = self.get_ancestor(Gtk.Popover)
if popover is not None:
popover.popdown()
- App().window.container.show_artist_view(self._album.artist_ids)
+ App().window.container.show_artists_albums(self._album.artist_ids)
elif self.__view_type & ViewType.DND:
if App().player.current_track.album.id == self._album.id:
# If not last album, skip it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/view_information.py
new/lollypop-1.1.4.2/lollypop/view_information.py
--- old/lollypop-1.1.4.1/lollypop/view_information.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/view_information.py 2019-07-08
18:28:15.000000000 +0200
@@ -179,7 +179,7 @@
popover.popdown()
if App().player.current_track.id is None:
return
- GLib.idle_add(App().window.container.show_artist_view,
+ GLib.idle_add(App().window.container.show_artists_albums,
App().player.current_track.album.artist_ids)
def __on_label_button_release_event(self, button, event):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/lollypop/widgets_album_simple.py
new/lollypop-1.1.4.2/lollypop/widgets_album_simple.py
--- old/lollypop-1.1.4.1/lollypop/widgets_album_simple.py 2019-07-07
16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/lollypop/widgets_album_simple.py 2019-07-08
18:28:15.000000000 +0200
@@ -264,7 +264,7 @@
@param eventbox as Gtk.EventBox
@param event as Gdk.EventButton
"""
- App().window.container.show_artist_view(self._album.artist_ids)
+ App().window.container.show_artists_albums(self._album.artist_ids)
return True
def __on_destroy(self, widget):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lollypop-1.1.4.1/meson.build
new/lollypop-1.1.4.2/meson.build
--- old/lollypop-1.1.4.1/meson.build 2019-07-07 16:54:06.000000000 +0200
+++ new/lollypop-1.1.4.2/meson.build 2019-07-08 18:28:15.000000000 +0200
@@ -1,5 +1,5 @@
project('lollypop',
- version: '1.1.4.1',
+ version: '1.1.4.2',
meson_version: '>= 0.40.0'
)
i18n = import('i18n')
