From 85fa5ba43fda2d7abad8f1deb08c57b907c2ee29 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Wed, 1 Jan 2025 14:36:43 +0100
Subject: [PATCH] cargo: Update glycin to support jpeg editing

---
 Cargo.lock                                   | 27 ++++++++------------
 Cargo.toml                                   |  2 +-
 build-aux/flatpak/org.gnome.Loupe.Devel.json |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e6f4b0..afd887b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -898,7 +898,7 @@ dependencies = [
 [[package]]
 name = "glycin"
 version = "2.0.1"
-source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=a7922d4435d3d8db392b33f4733ea164bc78c77f#a7922d4435d3d8db392b33f4733ea164bc78c77f"
+source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde#b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde"
 dependencies = [
  "async-fs",
  "async-io",
@@ -929,7 +929,7 @@ dependencies = [
 [[package]]
 name = "glycin-utils"
 version = "3.0.0"
-source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=a7922d4435d3d8db392b33f4733ea164bc78c77f#a7922d4435d3d8db392b33f4733ea164bc78c77f"
+source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde#b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde"
 dependencies = [
  "env_logger",
  "gufo-common",
@@ -1066,7 +1066,7 @@ dependencies = [
 [[package]]
 name = "gufo"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "chrono",
  "gufo-common",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "gufo-common"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#63033763825c4b68cd631aa7d0c9d4ff6680752e"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "chrono",
  "paste",
@@ -1094,7 +1094,7 @@ dependencies = [
 [[package]]
 name = "gufo-exif"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#63033763825c4b68cd631aa7d0c9d4ff6680752e"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "chrono",
  "gufo-common",
@@ -1105,10 +1105,9 @@ dependencies = [
 [[package]]
 name = "gufo-jpeg"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "gufo-common",
- "jpeg-encoder",
  "thiserror",
  "tracing",
 ]
@@ -1116,7 +1115,7 @@ dependencies = [
 [[package]]
 name = "gufo-png"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "gufo-common",
  "hex",
@@ -1127,7 +1126,7 @@ dependencies = [
 [[package]]
 name = "gufo-tiff"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "gufo-common",
  "thiserror",
@@ -1136,7 +1135,7 @@ dependencies = [
 [[package]]
 name = "gufo-webp"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "gufo-common",
  "thiserror",
@@ -1145,7 +1144,7 @@ dependencies = [
 [[package]]
 name = "gufo-xmp"
 version = "0.2.0"
-source = "git+https://github.com/gufo-rs/gufo.git#704168362f788ddf984920261a7171406bc7c1c0"
+source = "git+https://github.com/gufo-rs/gufo.git#a76733aa51f77e927d2671745cdf84110dc0dadb"
 dependencies = [
  "chrono",
  "gufo-common",
@@ -1393,12 +1392,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "jpeg-encoder"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fefe5a4fb12fa836172dc53cc36c37af693f6197ae702f931faad8774caf926"
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 15348ee..f82820e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ gettext-sys = { version = "0.22.5", features = ["gettext-system"] }
 gio = { version = "0.20.0", features = ["v2_74"] }
 glycin = { version = "2.0.1", features = [
     "gdk4",
-], git = "https://gitlab.gnome.org/GNOME/glycin.git", rev = "a7922d4435d3d8db392b33f4733ea164bc78c77f" }
+], git = "https://gitlab.gnome.org/GNOME/glycin.git", rev = "b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde" }
 gtk = { package = "gtk4", version = "0.9.5", features = [
     "v4_14",
     "xml_validation",
diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json
index 882add5..52d06e4 100644
--- a/build-aux/flatpak/org.gnome.Loupe.Devel.json
+++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json
@@ -113,7 +113,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/glycin.git",
-                    "commit": "a7922d4435d3d8db392b33f4733ea164bc78c77f"
+                    "commit": "b3fcc4f0b4ad11ce1f7d158fc5a3a54c9a7dedde"
                 }
             ]
         },