From 619b4f81502d3a8846eda27e323b46e52f2c1cf6 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Tue, 23 Jan 2024 21:02:07 +0100
Subject: [PATCH] cargo: Update glycin

---
 Cargo.lock                                   | 14 +++++++-------
 Cargo.toml                                   |  3 +--
 build-aux/flatpak/org.gnome.Loupe.Devel.json |  2 +-
 src/metadata/mod.rs                          |  5 ++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 583ec467..78ad8d00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1032,9 +1032,9 @@ dependencies = [
 
 [[package]]
 name = "glycin"
-version = "1.0.0-alpha.2"
+version = "1.0.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78dd20ce3bde5b9852e73990838c494b661a7ce48d8083e69638439e1d4cf55f"
+checksum = "b32d07bba79724f3dc4523aa66434369b938296adbad02d71a657e46fd4048ed"
 dependencies = [
  "anyhow",
  "async-fs 2.1.0",
@@ -1047,6 +1047,7 @@ dependencies = [
  "glycin-utils",
  "lcms2",
  "lcms2-sys",
+ "libc",
  "memfd",
  "memmap2",
  "nix 0.27.1",
@@ -1056,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "glycin-utils"
-version = "1.0.0-alpha.2"
+version = "1.0.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "040bc5c15bd3e2c05a08f9e474a1f8ad70a42ee736842dfa9727ce0b2e2342a4"
+checksum = "3524a7bced399319dbfab49c3bbe28486243407284bebc0757bcae24f6a509de"
 dependencies = [
  "anyhow",
  "gettext-rs",
@@ -1414,9 +1415,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libgweather"
@@ -1488,7 +1489,6 @@ dependencies = [
  "gettext-sys",
  "gio",
  "glycin",
- "glycin-utils",
  "gtk4",
  "gvdb-macros",
  "indexmap",
diff --git a/Cargo.toml b/Cargo.toml
index ec9508c4..2d59568f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,8 +19,7 @@ async-channel = "2.1.0"
 env_logger = "0.10.0"
 futures-channel = "0.3.25"
 futures-lite = "2.1.0"
-glycin = "1.0.0-alpha.2"
-glycin-utils = "1.0.0-alpha.2"
+glycin = "1.0.0-alpha.3"
 gvdb-macros = "0.1.6"
 indexmap = "2.0.0"
 kamadak-exif = "0.5.5"
diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json
index 44f179aa..6e617de4 100644
--- a/build-aux/flatpak/org.gnome.Loupe.Devel.json
+++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json
@@ -170,7 +170,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/sophie-h/glycin.git",
-                    "commit": "40b1b467ee461f9a21800f733387fc613825647b"
+                    "commit": "473b400bf04625564f807728bde5e80be3343890"
                 }
             ]
         },
diff --git a/src/metadata/mod.rs b/src/metadata/mod.rs
index 913bd933..8a0cd3e8 100644
--- a/src/metadata/mod.rs
+++ b/src/metadata/mod.rs
@@ -25,7 +25,7 @@ mod file;
 mod gps;
 
 pub use file::FileInfo;
-use glycin_utils::{FrameDetails, ImageInfoDetails};
+use glycin::{FrameDetails, ImageInfoDetails};
 pub use gps::GPSLocation;
 
 use crate::deps::*;
@@ -37,8 +37,7 @@ pub struct Metadata {
     mime_type: Option<String>,
     exif: Option<exif::Exif>,
     file_info: Option<FileInfo>,
-    // TODO: Replace with glycin in newer glycin version
-    image_info: Option<glycin_utils::ImageInfoDetails>,
+    image_info: Option<glycin::ImageInfoDetails>,
     frame_info: Option<FrameDetails>,
 }
 
-- 
GitLab