From 721a21e6fa2d81ab988224e58c8a6364f1acdac7 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Fri, 6 Sep 2024 17:28:48 +0200
Subject: [PATCH] Update glib

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 Cargo.lock          | 167 ++++++++++++--------------------------------
 playback/Cargo.toml |   2 +-
 2 files changed, 45 insertions(+), 124 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3e68a7e1..11f5ff92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -302,16 +302,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
 [[package]]
 name = "cfg-expr"
 version = "0.16.0"
@@ -426,7 +416,7 @@ dependencies = [
  "core-foundation-sys",
  "coreaudio-rs",
  "dasp_sample",
- "jack",
+ "jack 0.11.4",
  "jni",
  "js-sys",
  "libc",
@@ -835,37 +825,24 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
-[[package]]
-name = "gio-sys"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40"
-dependencies = [
- "glib-sys 0.19.5",
- "gobject-sys 0.19.5",
- "libc",
- "system-deps 6.2.2",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "gio-sys"
 version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
 dependencies = [
- "glib-sys 0.20.2",
- "gobject-sys 0.20.1",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "glib"
-version = "0.19.7"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490"
+checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
 dependencies = [
  "bitflags 2.6.0",
  "futures-channel",
@@ -873,48 +850,13 @@ dependencies = [
  "futures-executor",
  "futures-task",
  "futures-util",
- "gio-sys 0.19.5",
- "glib-macros 0.19.7",
- "glib-sys 0.19.5",
- "gobject-sys 0.19.5",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
  "libc",
  "memchr",
  "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1ea829497810f8e87f5ee6d05c4879af641704add879e6b6080607cceeefe4"
-dependencies = [
- "bitflags 2.6.0",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys 0.20.1",
- "glib-macros 0.20.2",
- "glib-sys 0.20.2",
- "gobject-sys 0.20.1",
- "libc",
- "memchr",
- "smallvec",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.19.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e"
-dependencies = [
- "heck",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.76",
 ]
 
 [[package]]
@@ -930,16 +872,6 @@ dependencies = [
  "syn 2.0.76",
 ]
 
-[[package]]
-name = "glib-sys"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282"
-dependencies = [
- "libc",
- "system-deps 6.2.2",
-]
-
 [[package]]
 name = "glib-sys"
 version = "0.20.2"
@@ -947,7 +879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
 dependencies = [
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -956,26 +888,15 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "gobject-sys"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b"
-dependencies = [
- "glib-sys 0.19.5",
- "libc",
- "system-deps 6.2.2",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
 dependencies = [
- "glib-sys 0.20.2",
+ "glib-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -1006,7 +927,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "glib 0.20.2",
+ "glib",
  "gstreamer-sys",
  "itertools 0.13.0",
  "libc",
@@ -1029,7 +950,7 @@ checksum = "e0c86915cc4cdfa030532301a46c725e0ce0c6c2b57a68c44ce9b34db587e552"
 dependencies = [
  "futures-core",
  "futures-sink",
- "glib 0.20.2",
+ "glib",
  "gstreamer",
  "gstreamer-app-sys",
  "gstreamer-base",
@@ -1042,11 +963,11 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37066c1b93ba57aa070ebc1e0a564bc1a9adda78fb0850e624861fad46fd1448"
 dependencies = [
- "glib-sys 0.20.2",
+ "glib-sys",
  "gstreamer-base-sys",
  "gstreamer-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -1056,7 +977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50c434cbdde750d82853a978a59eb96e270c238d721a41bee0f37bfdc771f997"
 dependencies = [
  "cfg-if",
- "glib 0.20.2",
+ "glib",
  "gstreamer",
  "gstreamer-audio-sys",
  "gstreamer-base",
@@ -1071,12 +992,12 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bb0542026fb062c2880d15e712c0814336e3209a054da43a64c14f7570da02f"
 dependencies = [
- "glib-sys 0.20.2",
- "gobject-sys 0.20.1",
+ "glib-sys",
+ "gobject-sys",
  "gstreamer-base-sys",
  "gstreamer-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -1087,7 +1008,7 @@ checksum = "ed5d73cb5cbf229c8904fba5ff93b1863f186bccc062064c1b2a9000750cc06e"
 dependencies = [
  "atomic_refcell",
  "cfg-if",
- "glib 0.20.2",
+ "glib",
  "gstreamer",
  "gstreamer-base-sys",
  "libc",
@@ -1099,11 +1020,11 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05"
 dependencies = [
- "glib-sys 0.20.2",
- "gobject-sys 0.20.1",
+ "glib-sys",
+ "gobject-sys",
  "gstreamer-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -1112,10 +1033,10 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3"
 dependencies = [
- "glib-sys 0.20.2",
- "gobject-sys 0.20.1",
+ "glib-sys",
+ "gobject-sys",
  "libc",
- "system-deps 7.0.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -1590,6 +1511,19 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "jack"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce77c8a5255e978fdf6836703f0c09b474df7dede0be1a1a5a43fe8ff055d30a"
+dependencies = [
+ "bitflags 2.6.0",
+ "jack-sys",
+ "lazy_static",
+ "libc",
+ "log",
+]
+
 [[package]]
 name = "jack-sys"
 version = "0.5.1"
@@ -1930,11 +1864,11 @@ dependencies = [
  "byteorder",
  "cpal",
  "futures-util",
- "glib 0.19.7",
+ "glib",
  "gstreamer",
  "gstreamer-app",
  "gstreamer-audio",
- "jack",
+ "jack 0.12.2",
  "libpulse-binding",
  "libpulse-simple-binding",
  "librespot-audio",
@@ -3231,26 +3165,13 @@ dependencies = [
  "windows 0.54.0",
 ]
 
-[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr 0.15.8",
- "heck",
- "pkg-config",
- "toml",
- "version-compare 0.2.0",
-]
-
 [[package]]
 name = "system-deps"
 version = "7.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031"
 dependencies = [
- "cfg-expr 0.16.0",
+ "cfg-expr",
  "heck",
  "pkg-config",
  "toml",
diff --git a/playback/Cargo.toml b/playback/Cargo.toml
index 1e64668e..269527ce 100644
--- a/playback/Cargo.toml
+++ b/playback/Cargo.toml
@@ -40,7 +40,7 @@ sdl2            = { version = "0.37", optional = true }
 gstreamer       = { version = "0.23.1", optional = true }
 gstreamer-app   = { version = "0.23.0", optional = true }
 gstreamer-audio = { version = "0.23.0", optional = true }
-glib            = { version = "0.19.2", optional = true }
+glib            = { version = "0.20.3", optional = true }
 
 # Rodio dependencies
 rodio           = { version = "0.19.0", optional = true, default-features = false }