From 6fe77fa6e555552ff9a389b4bd28cd92b0bb7c6b Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Mon, 24 Jul 2023 16:30:52 +0200 Subject: [PATCH] flatpak: Use newer glycin version to test JXL Closes #90 Part-of: --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- build-aux/flatpak/org.gnome.Loupe.Devel.json | 2 +- data/meson.build | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09b7d7e0..b25b340f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,9 +1093,9 @@ dependencies = [ [[package]] name = "glycin" -version = "0.1.0-alpha.3" +version = "0.1.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c023cb02a65666081c306da25bd45a7cb099c0aad8d9b4e248fd1a52795c612b" +checksum = "fcf7b231b1f126c75a1b4907c78490f57ac214294367b62e7978aaa7d03f6527" dependencies = [ "anyhow", "async-std", @@ -1114,9 +1114,9 @@ dependencies = [ [[package]] name = "glycin-utils" -version = "0.1.0-alpha.3" +version = "0.1.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3625f9e24dbf4ae22fd2237d29eddd063e7802c25aa49178c08b8bdedc65412" +checksum = "d8896bded9f0dbc5e6883758e61636817d8fb8f2ad57be16354c8406289d7d95" dependencies = [ "anyhow", "async-std", diff --git a/Cargo.toml b/Cargo.toml index 31a79a54..f7233018 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ url = "2.3.1" # decoders librsvg = { git = "https://gitlab.gnome.org/GNOME/librsvg.git", rev = "51c80502b8474ec10c315da3559a049bdf4fe8f1" } -glycin = "0.1.0-alpha.3" +glycin = "0.1.0-alpha.4" [dependencies.ashpd] version = "0.4.0" diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json index 8c10d704..39f1738f 100644 --- a/build-aux/flatpak/org.gnome.Loupe.Devel.json +++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json @@ -156,7 +156,7 @@ { "type" : "git", "url" : "https://gitlab.gnome.org/sophie-h/glycin.git", - "commit" : "2e3f9add120a4913e559729d361d6d7e5d010f2b" + "commit" : "ab8c7ae22d9905a33eaa06c8246474525ca9720e" } ] }, diff --git a/data/meson.build b/data/meson.build index 3bbe842a..ef6b855d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -41,6 +41,11 @@ mime_types += [ 'image/heic', ] +# JXL +mime_types += [ + 'image/jxl', +] + conf.set('MIME_TYPES', ';'.join(mime_types) + ';') desktop_file = i18n.merge_file( -- GitLab