Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2020-03-11 22:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lollypop" Wed Mar 11 22:03:56 2020 rev:122 rq:784059 version:1.2.25 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2020-03-11 18:54:27.819651201 +0100 +++ /work/SRC/openSUSE:Factory/.lollypop.new.3160/lollypop.changes 2020-03-11 22:04:59.437998122 +0100 @@ -1,0 +2,7 @@ +Wed Mar 11 19:26:28 UTC 2020 - [email protected] + +- Update to version 1.2.25: + * Fix an issue with new "open with" dialog on Ubuntu + (glgo#World/lollypop#287). + +------------------------------------------------------------------- Old: ---- lollypop-1.2.24.tar.xz New: ---- lollypop-1.2.25.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.9JWXIa/_old 2020-03-11 22:05:00.009998441 +0100 +++ /var/tmp/diff_new_pack.9JWXIa/_new 2020-03-11 22:05:00.013998444 +0100 @@ -17,7 +17,7 @@ Name: lollypop -Version: 1.2.24 +Version: 1.2.25 Release: 0 Summary: GNOME music playing application License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9JWXIa/_old 2020-03-11 22:05:00.033998455 +0100 +++ /var/tmp/diff_new_pack.9JWXIa/_new 2020-03-11 22:05:00.033998455 +0100 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> - <param name="revision">1.2.24</param> + <param name="revision">1.2.25</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.9JWXIa/_old 2020-03-11 22:05:00.045998461 +0100 +++ /var/tmp/diff_new_pack.9JWXIa/_new 2020-03-11 22:05:00.045998461 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.gnome.org/World/lollypop.git</param> - <param name="changesrevision">79e24a72303e67836cfb93002ce8ab39bc115556</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">efa9890e94ed66ba3b447eea8b2b8d7609455511</param></service></servicedata> \ No newline at end of file ++++++ lollypop-1.2.24.tar.xz -> lollypop-1.2.25.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.24/bin/revision.sh new/lollypop-1.2.25/bin/revision.sh --- old/lollypop-1.2.24/bin/revision.sh 2020-03-10 18:12:40.000000000 +0100 +++ new/lollypop-1.2.25/bin/revision.sh 2020-03-11 16:25:40.000000000 +0100 @@ -1,2 +1,8 @@ #!/bin/sh -git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +VERSION="@VERSION@" +if [[ $VERSION != "@VERSION@" ]] +then + echo $VERSION +else + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.24/data/org.gnome.Lollypop.appdata.xml.in new/lollypop-1.2.25/data/org.gnome.Lollypop.appdata.xml.in --- old/lollypop-1.2.24/data/org.gnome.Lollypop.appdata.xml.in 2020-03-10 18:12:40.000000000 +0100 +++ new/lollypop-1.2.25/data/org.gnome.Lollypop.appdata.xml.in 2020-03-11 16:25:40.000000000 +0100 @@ -17,7 +17,7 @@ </ul> </description> <releases> - <release version="1.2.24" date="2020-03-10"> + <release version="1.2.25" date="2020-03-11"> <description> </description> </release> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.24/lollypop/dialog_apps.py new/lollypop-1.2.25/lollypop/dialog_apps.py --- old/lollypop-1.2.24/lollypop/dialog_apps.py 2020-03-10 18:12:40.000000000 +0100 +++ new/lollypop-1.2.25/lollypop/dialog_apps.py 2020-03-11 16:25:40.000000000 +0100 @@ -63,7 +63,7 @@ @param f as Gio.File """ Gtk.Dialog.__init__(self) - self.__executable = None + self.__commandline = None self.__open_with = {} self.set_size_request(300, 300) self.set_transient_for(App().window) @@ -116,12 +116,12 @@ Logger.error("AppsDialog::__init__(): %s", e) @property - def executable(self): + def commandline(self): """ - Get current executable for dialog + Get current commandline for dialog @return str/None """ - return self.__executable + return self.__commandline ####################### # PRIVATE # @@ -149,7 +149,7 @@ @param row_b as AppListBoxRow @return bool """ - if row_b.app.get_executable() == self.__last_app: + if row_b.app.get_commandline() == self.__last_app: return True return False @@ -161,19 +161,19 @@ @param content_type as str """ if response_id == Gtk.ResponseType.OK: - if dialog.executable is not None: - self.__open_with[content_type] = dialog.executable + if dialog.commandline is not None: + self.__open_with[content_type] = dialog.commandline data = json.dumps(self.__open_with) App().settings.set_value("open-with", GLib.Variant("s", data)) def __on_row_selected(self, listbox, row): """ - Set current executable + Set current commandline @param listbox as Gtk.ListBox @param row as AppListBoxRow """ if row is None: - self.__executable = None + self.__commandline = None else: - self.__executable = row.app.get_executable() + self.__commandline = row.app.get_commandline() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.24/lollypop/menu_actions.py new/lollypop-1.2.25/lollypop/menu_actions.py --- old/lollypop-1.2.24/lollypop/menu_actions.py 2020-03-10 18:12:40.000000000 +0100 +++ new/lollypop-1.2.25/lollypop/menu_actions.py 2020-03-11 16:25:40.000000000 +0100 @@ -152,16 +152,22 @@ @param GLib.Variant """ try: - def launch_app(executable, f): + def launch_app(commandline, f): if f.query_exists(): - path = f.get_path() - arguments = [ - [executable, path], - ["flatpak-spawn", "--host", executable, path]] - for argv in arguments: + args = [] + for item in commandline.split(): + if item == "%U": + args.append(f.get_uri()) + elif item == "%F": + args.append(f.get_path()) + else: + args.append(item) + commands = [args, + ["flatpak-spawn", "--host"] + args] + for cmd in commands: try: (pid, stdin, stdout, stderr) = GLib.spawn_async( - argv, flags=GLib.SpawnFlags.SEARCH_PATH | + cmd, flags=GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.STDOUT_TO_DEV_NULL, standard_input=False, standard_output=False, @@ -174,8 +180,8 @@ def on_response(dialog, response_id, f): if response_id == Gtk.ResponseType.OK: - if dialog.executable is not None: - launch_app(dialog.executable, f) + if dialog.commandline is not None: + launch_app(dialog.commandline, f) dialog.destroy() f = Gio.File.new_for_uri(self.__object.uri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lollypop-1.2.24/meson.build new/lollypop-1.2.25/meson.build --- old/lollypop-1.2.24/meson.build 2020-03-10 18:12:40.000000000 +0100 +++ new/lollypop-1.2.25/meson.build 2020-03-11 16:25:40.000000000 +0100 @@ -1,5 +1,5 @@ project('lollypop', - version: '1.2.24', + version: '1.2.25', meson_version: '>= 0.40.0' ) revision = run_command('bin/revision.sh').stdout().strip()
