From f319851753cd27a5fb7633fb11e516c219e71027 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 25 Jan 2020 22:13:39 +0200 Subject: [PATCH] Upgrade gtk-rs stack --- Cargo.lock | 282 ++++++++++++++++++------- meson.build | 2 +- org.gnome.Podcasts.Devel.json | 2 +- org.gnome.Podcasts.json | 2 +- podcasts-gtk/Cargo.toml | 29 ++- podcasts-gtk/src/settings.rs | 20 +- podcasts-gtk/src/stacks/populated.rs | 2 +- podcasts-gtk/src/static_resource.rs.in | 4 +- podcasts-gtk/src/utils.rs | 11 +- podcasts-gtk/src/widgets/shows_view.rs | 5 +- 10 files changed, 245 insertions(+), 114 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 797b53a..da97852 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,12 +52,12 @@ dependencies = [ [[package]] name = "atk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -152,12 +152,12 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -568,6 +568,19 @@ name = "futures" version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "futures-channel" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "futures-core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "futures-cpupool" version = "0.1.8" @@ -577,34 +590,79 @@ dependencies = [ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "futures-executor" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "futures-io" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "futures-macro" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "futures-task" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "futures-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gdk" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-pixbuf" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -666,13 +724,16 @@ dependencies = [ [[package]] name = "gio" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -692,10 +753,15 @@ dependencies = [ [[package]] name = "glib" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -728,12 +794,15 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.14.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -741,18 +810,19 @@ dependencies = [ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gstreamer-base" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -772,23 +842,23 @@ dependencies = [ [[package]] name = "gstreamer-player" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-player-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-player-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-video 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gstreamer-player-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -812,15 +882,15 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.14.5" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-video-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -843,27 +913,27 @@ dependencies = [ [[package]] name = "gtk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "atk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1094,33 +1164,33 @@ dependencies = [ [[package]] name = "libhandy" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "libhandy-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libhandy-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libhandy-sys" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1306,11 +1376,11 @@ dependencies = [ [[package]] name = "mpris-player" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1434,11 +1504,11 @@ dependencies = [ [[package]] name = "pango" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1503,6 +1573,26 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "paste" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "paste-impl" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "percent-encoding" version = "1.0.1" @@ -1547,6 +1637,11 @@ dependencies = [ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "pin-utils" +version = "0.1.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "pkg-config" version = "0.3.17" @@ -1610,25 +1705,25 @@ dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gettext-rs 0.4.2 (git+https://github.com/danigm/gettext-rs?branch=no-gettext)", - "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-player 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-player 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "html2text 0.1.8 (git+https://github.com/jugglerchris/rust-html2text)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libhandy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libhandy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "loggerv 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mpris-player 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "mpris-player 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "podcasts-data 0.1.0", "podcasts-downloader 0.1.0", "pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1660,6 +1755,21 @@ dependencies = [ "output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "proc-macro-nested" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "proc-macro2" version = "1.0.8" @@ -2634,7 +2744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ammonia 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9e266e1f4be5ffa05309f650e2586fe1d3ae6034eb24025a7ae1dfecc330823a" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a" +"checksum atk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "444daefa55f229af145ea58d77efd23725024ee1f6f3102743709aa6b18c663e" "checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" @@ -2646,7 +2756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c" +"checksum cairo-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b528aca2ef1026235d0122495dbaee0b09479f77c51f6df8d9bb9cb1c6d6f87" "checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" @@ -2694,29 +2804,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" "checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" +"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86" +"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5" -"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc" +"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231" +"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff" +"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764" +"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9" +"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76" +"checksum gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2739c12374f83bad563ee839c2b3ea5c60391465a254fd4a54b6e3e9648dc61f" +"checksum gdk-pixbuf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e248220c46b329b097d4b158d2717f8c688f16dd76d0399ace82b3e98062bdd7" "checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" "checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum gettext-rs 0.4.2 (git+https://github.com/danigm/gettext-rs?branch=no-gettext)" = "" "checksum gettext-sys 0.19.9 (git+https://github.com/danigm/gettext-rs?branch=no-gettext)" = "" -"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3" +"checksum gio 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "879a5eb1a91623819d658669104fb587c1ae68695d50947f3e4949a00c6bc218" "checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" -"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" +"checksum glib 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27bafffe3fc615449d5a87705f93f6fe4fcf749662b9d08cc9d5451f6c1b0f21" "checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" "checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" -"checksum gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa91e470b0cd4b05611f7d0e89caf76e39752156440877f04c23ad34ffc9761c" -"checksum gstreamer-base 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "37ed3ddb8f1a65e401340afb5657d2107d78c82f06a081e19393fc8d4c5ee720" +"checksum gstreamer 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f439859b5f3310518adc0aea572ac89ddd94f8ba3af4626d6156733671599629" +"checksum gstreamer-base 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eaec2ff20b049560762f83545d95b33fd1533512792f37a9a3f6800e45da42b" "checksum gstreamer-base-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" -"checksum gstreamer-player 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78395f87de2b954ca3e33a594a4eb85e68246f5f41a70bf0ab52187aacb4d3a9" -"checksum gstreamer-player-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3608d3e96c8977f31b9b8db7da0b8d0e96758b060e3f05fc3ee9626d75ab1c5" +"checksum gstreamer-player 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5a6f2b2abaee439c38a24814de2522190560ccdcffd6fe301ebc085e62a17c3" +"checksum gstreamer-player-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9cc38a730aed3442cad1c8df589b4abe856d14671058df7099a5a030fd61413c" "checksum gstreamer-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" -"checksum gstreamer-video 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0b48c3edfa6c0419ad7587a557bbed716caf5585c3be65bfbe3584703735df51" +"checksum gstreamer-video 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad7e08514b2095c272a2cf5a159fcda13530da800621f5944bce8e4429b2f4d" "checksum gstreamer-video-sys 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "615f4298f842f4b4581606e13cf52e1710e2130d989bb99161a5665aa3ccb7cc" -"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60" +"checksum gtk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd1d646cc9a2cb795f33b538779a3f22e71dc172f2aba08a41e84a2f72c0dec" "checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" @@ -2740,8 +2857,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" "checksum libdbus-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" -"checksum libhandy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7195919b261667e13240c14004c3fdc1a07a77ee865a9e0da5c2a4e134171c25" -"checksum libhandy-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "17019593005fd387b0d2f6e5b29533796e3206e9f433dbf74846a609ceeb5fbf" +"checksum libhandy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa9f5620e4143358bcd645fe7d7d27b974ed9148cbdd490bc811813899afa07" +"checksum libhandy-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d707af842e918719b71af0ac6cf31d1843f6e8a4d1e9c733b998d8d482e60446" "checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25" "checksum locale_config 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c" "checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" @@ -2762,7 +2879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum mpris-player 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaeb531079f21d3490202da4058c015346e92dcfd908616bf86a283f35d4154d" +"checksum mpris-player 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d90fee39ea8cf6dbae3ffb144d6db7feca90f6c86229fc458039e0d4bca5bf02" "checksum muldiv 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" @@ -2776,22 +2893,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" "checksum output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786" +"checksum pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9c6b728f1be8edb5f9f981420b651d5ea30bdb9de89f1f1262d0084a020577" "checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" +"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49" +"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" "checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" +"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" +"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" "checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" "checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" "checksum quick-xml 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0" diff --git a/meson.build b/meson.build index ec9ca54..b55b3ba 100644 --- a/meson.build +++ b/meson.build @@ -12,7 +12,7 @@ dependency('glib-2.0', version: '>= 2.56') dependency('gio-2.0', version: '>= 2.56') dependency('gdk-pixbuf-2.0') dependency('gtk+-3.0', version: '>= 3.24.11') -dependency('libhandy-0.0', version: '>= 0.0.11') +dependency('libhandy-0.0', version: '>= 0.0.13') dependency('gstreamer-1.0', version: '>= 1.16') dependency('gstreamer-base-1.0', version: '>= 1.16') diff --git a/org.gnome.Podcasts.Devel.json b/org.gnome.Podcasts.Devel.json index 3d40725..049ce73 100644 --- a/org.gnome.Podcasts.Devel.json +++ b/org.gnome.Podcasts.Devel.json @@ -50,7 +50,7 @@ { "type" : "git", "url" : "https://source.puri.sm/Librem5/libhandy.git", - "commit" : "f5909a897f70143bdd2f89f47a63c1bf848330ce" + "tag" : "v0.0.13" } ] }, diff --git a/org.gnome.Podcasts.json b/org.gnome.Podcasts.json index 7a9a0db..dfbcf95 100644 --- a/org.gnome.Podcasts.json +++ b/org.gnome.Podcasts.json @@ -50,7 +50,7 @@ { "type" : "git", "url" : "https://source.puri.sm/Librem5/libhandy.git", - "commit" : "f5909a897f70143bdd2f89f47a63c1bf848330ce" + "tag" : "v0.0.13" } ] }, diff --git a/podcasts-gtk/Cargo.toml b/podcasts-gtk/Cargo.toml index 18cf4d1..092a22d 100644 --- a/podcasts-gtk/Cargo.toml +++ b/podcasts-gtk/Cargo.toml @@ -7,12 +7,12 @@ edition = "2018" [dependencies] chrono = "0.4.9" crossbeam-channel = "0.3.9" -gdk = "0.11.0" -gdk-pixbuf = "0.7.0" -gobject-sys = "0.9.0" -glib-sys = "0.9.0" -gst = { version = "0.14.0", package = "gstreamer" } -gst-player = { version = "0.14.0", package = "gstreamer-player" } +gdk = "0.12.0" +gdk-pixbuf = "0.8.0" +gobject-sys = "0.9.1" +glib-sys = "0.9.1" +gst = { version = "0.15.2", package = "gstreamer" } +gst-player = { version = "0.15.0", package = "gstreamer-player" } humansize = "1.1.0" lazy_static = "1.4.0" log = "0.4.8" @@ -28,8 +28,8 @@ reqwest = "0.9.22" serde_json = "1.0.41" # html2text = "0.1.8" html2text = { git = "https://github.com/jugglerchris/rust-html2text" } -mpris-player = "0.4.0" -pango = "0.7.0" +mpris-player = "0.5.0" +pango = "0.8.0" [dependencies.gettext-rs] git = "https://github.com/danigm/gettext-rs" @@ -37,19 +37,18 @@ branch = "no-gettext" features = ["gettext-system"] [dependencies.glib] -features = ["subclassing"] -version = "0.8.2" +version = "0.9.1" [dependencies.gio] -features = ["v2_50", "subclassing"] -version = "0.7.0" +features = ["v2_50"] +version = "0.8.0" [dependencies.gtk] -features = ["v3_24", "subclassing"] -version = "0.7.0" +features = ["v3_24"] +version = "0.8.0" [dependencies.libhandy] -version = "0.4.0" +version = "0.5.0" features = [ "v0_0_10"] # [dependencies.mpris-player] diff --git a/podcasts-gtk/src/settings.rs b/podcasts-gtk/src/settings.rs index a46d55a..28820d4 100644 --- a/podcasts-gtk/src/settings.rs +++ b/podcasts-gtk/src/settings.rs @@ -81,11 +81,21 @@ impl WindowGeometry { } pub(crate) fn write(&self, settings: &gio::Settings) { - settings.set_int("persist-window-geometry-left", self.left); - settings.set_int("persist-window-geometry-top", self.top); - settings.set_int("persist-window-geometry-width", self.width); - settings.set_int("persist-window-geometry-height", self.height); - settings.set_boolean("persist-window-geometry-maximized", self.is_maximized); + settings + .set_int("persist-window-geometry-left", self.left) + .unwrap(); + settings + .set_int("persist-window-geometry-top", self.top) + .unwrap(); + settings + .set_int("persist-window-geometry-width", self.width) + .unwrap(); + settings + .set_int("persist-window-geometry-height", self.height) + .unwrap(); + settings + .set_boolean("persist-window-geometry-maximized", self.is_maximized) + .unwrap(); } } diff --git a/podcasts-gtk/src/stacks/populated.rs b/podcasts-gtk/src/stacks/populated.rs index b4388fb..2eb6c48 100644 --- a/podcasts-gtk/src/stacks/populated.rs +++ b/podcasts-gtk/src/stacks/populated.rs @@ -90,7 +90,7 @@ impl PopulatedStack { pub(crate) fn replace_shows(&mut self) -> Result<(), Error> { let old = &self.populated.view.container().clone(); - debug!("Name: {:?}", WidgetExt::get_name(old)); + debug!("Name: {:?}", old.get_widget_name()); let vadj = self.populated.view.get_vadjustment(); let pop = ShowsView::new(self.sender.clone(), vadj); diff --git a/podcasts-gtk/src/static_resource.rs.in b/podcasts-gtk/src/static_resource.rs.in index a6c303e..9be9b47 100644 --- a/podcasts-gtk/src/static_resource.rs.in +++ b/podcasts-gtk/src/static_resource.rs.in @@ -17,8 +17,8 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -use gio::{resources_register, Error, Resource}; -use glib::Bytes; +use gio::{resources_register, Resource}; +use glib::{Error, Bytes}; pub(crate) fn init() -> Result<(), Error> { // load the gresource binary at build time and include/link it into the final diff --git a/podcasts-gtk/src/utils.rs b/podcasts-gtk/src/utils.rs index c1b82c7..981a3bd 100644 --- a/podcasts-gtk/src/utils.rs +++ b/podcasts-gtk/src/utils.rs @@ -19,11 +19,12 @@ #![allow(clippy::type_complexity)] -use gdk_pixbuf::{Object, Pixbuf}; +use gdk_pixbuf::Pixbuf; use glib::{self, object::WeakRef}; +use glib::{IsA, Object}; use gtk; use gtk::prelude::*; -use gtk::{IsA, Widget}; +use gtk::Widget; use chrono::prelude::*; use crossbeam_channel::{bounded, unbounded, Sender}; @@ -388,7 +389,6 @@ fn lookup_id(id: u32) -> Result { } pub(crate) fn on_import_clicked(window: >k::ApplicationWindow, sender: &Sender) { - use glib::translate::ToGlib; use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; // Create the FileChooser Dialog @@ -412,7 +412,7 @@ pub(crate) fn on_import_clicked(window: >k::ApplicationWindow, sender: &Sender let resp = dialog.run(); debug!("Dialog Response {}", resp); - if resp == ResponseType::Accept.to_glib() { + if resp == ResponseType::Accept { if let Some(filename) = dialog.get_filename() { debug!("File selected: {:?}", filename); @@ -436,7 +436,6 @@ pub(crate) fn on_import_clicked(window: >k::ApplicationWindow, sender: &Sender } pub(crate) fn on_export_clicked(window: >k::ApplicationWindow, sender: &Sender) { - use glib::translate::ToGlib; use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; // Create the FileChooser Dialog @@ -460,7 +459,7 @@ pub(crate) fn on_export_clicked(window: >k::ApplicationWindow, sender: &Sender let resp = dialog.run(); debug!("Dialog Response {}", resp); - if resp == ResponseType::Accept.to_glib() { + if resp == ResponseType::Accept { if let Some(filename) = dialog.get_filename() { debug!("File selected: {:?}", filename); diff --git a/podcasts-gtk/src/widgets/shows_view.rs b/podcasts-gtk/src/widgets/shows_view.rs index 15ad678..97c108e 100644 --- a/podcasts-gtk/src/widgets/shows_view.rs +++ b/podcasts-gtk/src/widgets/shows_view.rs @@ -100,7 +100,8 @@ fn populate_flowbox(shows: &Rc, vadj: Option) -> Result<( fn on_child_activate(child: >k::FlowBoxChild, sender: &Sender) -> Result<(), Error> { // This is such an ugly hack... - let id = WidgetExt::get_name(child) + let id = child + .get_widget_name() .ok_or_else(|| format_err!("Failed to get \"episodes\" child from the stack."))? .parse::()?; let pd = Arc::new(dbqueries::get_podcast_from_id(id)?); @@ -148,7 +149,7 @@ impl ShowsChild { fn init(&self, pd: &Show) { self.child.set_tooltip_text(Some(pd.title())); - WidgetExt::set_name(&self.child, &pd.id().to_string()); + self.child.set_widget_name(&pd.id().to_string()); self.set_cover(pd.id()) }