From fe83811a8abf7c57e4fea2cd311ca421e0ade71a Mon Sep 17 00:00:00 2001
From: Elias Projahn <elias@johrpan.de>
Date: Sun, 1 May 2022 18:49:11 +0200
Subject: [PATCH] Use libadwaita from git

---
 Cargo.lock                    | 237 +++++++++++++++++++++-------------
 musicus/Cargo.toml            |   9 +-
 musicus/src/screens/player.rs |   1 +
 musicus/src/widgets/list.rs   |   3 +-
 4 files changed, 156 insertions(+), 94 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68ffe2b..ef05d6c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,24 +58,22 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cairo-rs"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62be3562254e90c1c6050a72aa638f6315593e98c5cdaba9017cedbabf0a5dee"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
- "glib 0.15.11",
+ "glib 0.16.0",
  "libc",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
- "glib-sys 0.15.10",
+ "glib-sys 0.16.0",
  "libc",
  "system-deps 6.0.2",
 ]
@@ -272,57 +270,53 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
  "bitflags",
  "gdk-pixbuf-sys",
- "gio",
- "glib 0.15.11",
+ "gio 0.16.0",
+ "glib 0.16.0",
  "libc",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
- "gio-sys",
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "gio-sys 0.16.0",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "libc",
  "system-deps 6.0.2",
 ]
 
 [[package]]
 name = "gdk4"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a2fc0bd03d59383fc10b71a8cb731a1fac2998732a36a0c03e9b1de1513218"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "bitflags",
  "cairo-rs",
  "gdk-pixbuf",
  "gdk4-sys",
- "gio",
- "glib 0.15.11",
+ "gio 0.16.0",
+ "glib 0.16.0",
  "libc",
  "pango",
 ]
 
 [[package]]
 name = "gdk4-sys"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "gio-sys 0.16.0",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "libc",
  "pango-sys",
  "pkg-config",
@@ -380,13 +374,29 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
- "gio-sys",
+ "gio-sys 0.15.10",
  "glib 0.15.11",
  "libc",
  "once_cell",
  "thiserror",
 ]
 
+[[package]]
+name = "gio"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "bitflags",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "gio-sys 0.16.0",
+ "glib 0.16.0",
+ "libc",
+ "once_cell",
+ "thiserror",
+]
+
 [[package]]
 name = "gio-sys"
 version = "0.15.10"
@@ -400,6 +410,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "gio-sys"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
+ "libc",
+ "system-deps 6.0.2",
+ "winapi",
+]
+
 [[package]]
 name = "glib"
 version = "0.10.3"
@@ -439,6 +461,26 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "glib"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "bitflags",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "glib-macros 0.16.0",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
+ "libc",
+ "once_cell",
+ "smallvec",
+ "thiserror",
+]
+
 [[package]]
 name = "glib-macros"
 version = "0.10.1"
@@ -470,6 +512,20 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "glib-macros"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "anyhow",
+ "heck 0.4.0",
+ "proc-macro-crate 1.1.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "glib-sys"
 version = "0.10.1"
@@ -490,6 +546,15 @@ dependencies = [
  "system-deps 6.0.2",
 ]
 
+[[package]]
+name = "glib-sys"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "libc",
+ "system-deps 6.0.2",
+]
+
 [[package]]
 name = "gobject-sys"
 version = "0.10.0"
@@ -513,23 +578,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "graphene-rs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570"
+name = "gobject-sys"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
- "glib 0.15.11",
+ "glib-sys 0.16.0",
+ "libc",
+ "system-deps 6.0.2",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
+dependencies = [
+ "glib 0.16.0",
  "graphene-sys",
  "libc",
 ]
 
 [[package]]
 name = "graphene-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa691fc7337ba1df599afb55c3bcb85c04f1b3f17362570e9bb0ff0d1bc3028a"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
- "glib-sys 0.15.10",
+ "glib-sys 0.16.0",
  "libc",
  "pkg-config",
  "system-deps 6.0.2",
@@ -537,14 +610,13 @@ dependencies = [
 
 [[package]]
 name = "gsk4"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d5a47a78c682bb67496b562495ed84972c0512ba0654888c4dc92b80a85bd3"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "bitflags",
  "cairo-rs",
  "gdk4",
- "glib 0.15.11",
+ "glib 0.16.0",
  "graphene-rs",
  "gsk4-sys",
  "libc",
@@ -553,14 +625,13 @@ dependencies = [
 
 [[package]]
 name = "gsk4-sys"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "graphene-sys",
  "libc",
  "pango-sys",
@@ -741,9 +812,8 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a"
 
 [[package]]
 name = "gtk4"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5d40303dabe4608fc260de2bd7563da6f85bc90af956323f0cd8ae0abcfe03"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -751,8 +821,8 @@ dependencies = [
  "futures-channel",
  "gdk-pixbuf",
  "gdk4",
- "gio",
- "glib 0.15.11",
+ "gio 0.16.0",
+ "glib 0.16.0",
  "graphene-rs",
  "gsk4",
  "gtk4-macros",
@@ -764,9 +834,8 @@ dependencies = [
 
 [[package]]
 name = "gtk4-macros"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3c4aa605fb3d78205c7aef0eeaa6db61d8cc4dd05a465dc6ffdfdaee84f825"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "anyhow",
  "proc-macro-crate 1.1.3",
@@ -779,16 +848,15 @@ dependencies = [
 
 [[package]]
 name = "gtk4-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d"
+version = "0.5.0"
+source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
  "gdk4-sys",
- "gio-sys",
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "gio-sys 0.16.0",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "graphene-sys",
  "gsk4-sys",
  "libc",
@@ -828,14 +896,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libadwaita"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ae453d28e3b91f03749f02b1531e8cfe315a1d0762b77a61797d2ab80bb87d"
+version = "0.2.0"
+source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#00488986662796deee21f0ca601be661b269b09c"
 dependencies = [
  "gdk-pixbuf",
  "gdk4",
- "gio",
- "glib 0.15.11",
+ "gio 0.16.0",
+ "glib 0.16.0",
  "gtk4",
  "libadwaita-sys",
  "libc",
@@ -845,14 +912,13 @@ dependencies = [
 
 [[package]]
 name = "libadwaita-sys"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
+version = "0.2.0"
+source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#00488986662796deee21f0ca601be661b269b09c"
 dependencies = [
  "gdk4-sys",
- "gio-sys",
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "gio-sys 0.16.0",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "gtk4-sys",
  "libc",
  "system-deps 6.0.2",
@@ -972,10 +1038,9 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures-channel",
- "gdk4",
  "gettext-rs",
- "gio",
- "glib 0.15.11",
+ "gio 0.16.0",
+ "glib 0.16.0",
  "gstreamer",
  "gtk-macros",
  "gtk4",
@@ -992,7 +1057,7 @@ name = "musicus_backend"
 version = "0.1.0"
 dependencies = [
  "fragile",
- "gio",
+ "gio 0.15.11",
  "glib 0.15.11",
  "gstreamer",
  "gstreamer-player",
@@ -1109,12 +1174,11 @@ dependencies = [
 
 [[package]]
 name = "pango"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
  "bitflags",
- "glib 0.15.11",
+ "glib 0.16.0",
  "libc",
  "once_cell",
  "pango-sys",
@@ -1122,12 +1186,11 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+version = "0.16.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced"
 dependencies = [
- "glib-sys 0.15.10",
- "gobject-sys 0.15.10",
+ "glib-sys 0.16.0",
+ "gobject-sys 0.16.0",
  "libc",
  "system-deps 6.0.2",
 ]
diff --git a/musicus/Cargo.toml b/musicus/Cargo.toml
index c74111e..7764ac0 100644
--- a/musicus/Cargo.toml
+++ b/musicus/Cargo.toml
@@ -5,14 +5,13 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.57"
-adw = { package = "libadwaita", version = "0.1.1" }
+adw = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git", package = "libadwaita", features = ["v1_2"] }
 futures-channel = "0.3.21"
-gdk = { package = "gdk4", version = "0.4.7" }
 gettext-rs = { version = "0.7.0", features = ["gettext-system"] }
-gio = "0.15.11"
-glib = "0.15.11"
+gio = {git = "https://github.com/gtk-rs/gtk-rs-core"}
+glib = {git = "https://github.com/gtk-rs/gtk-rs-core"}
 gstreamer = "0.18.8"
-gtk = { package = "gtk4", version = "0.4.7" }
+gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4" }
 gtk-macros = "0.3.0"
 log = "0.4.16"
 musicus_backend = { version = "0.1.0", path = "../backend" }
diff --git a/musicus/src/screens/player.rs b/musicus/src/screens/player.rs
index 2237615..e4232d7 100644
--- a/musicus/src/screens/player.rs
+++ b/musicus/src/screens/player.rs
@@ -2,6 +2,7 @@ use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{List, TrackRow, Widget};
 use adw::prelude::*;
 use glib::clone;
+use gtk::gdk;
 use gtk_macros::get_widget;
 use musicus_backend::db::Track;
 use std::cell::{Cell, RefCell};
diff --git a/musicus/src/widgets/list.rs b/musicus/src/widgets/list.rs
index d0710ce..ea8ca79 100644
--- a/musicus/src/widgets/list.rs
+++ b/musicus/src/widgets/list.rs
@@ -1,7 +1,6 @@
 use super::indexed_list_model::{IndexedListModel, ItemIndex};
 use glib::clone;
-use gtk::builders::ListBoxBuilder;
-use gtk::prelude::*;
+use gtk::{builders::ListBoxBuilder, gdk, prelude::*};
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;