From 6edf9a0380e6afe1c183d0dc75293fd92eefae6f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 14 Nov 2023 23:42:26 +0100
Subject: [PATCH] Enable glycin-jxl loader

We now have rust-jxl-oxide packaged in Fedora.
---
 ...Disable-JPEG-XL-missing-dependencies.patch | 28 -------------------
 glycin-loaders.spec                           |  4 +--
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 0002-Disable-JPEG-XL-missing-dependencies.patch

diff --git a/0002-Disable-JPEG-XL-missing-dependencies.patch b/0002-Disable-JPEG-XL-missing-dependencies.patch
deleted file mode 100644
index 37ddfb2..0000000
--- a/0002-Disable-JPEG-XL-missing-dependencies.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fe89df0302d3bc40796260773c862c59269d0528 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Tue, 19 Sep 2023 15:00:59 +0200
-Subject: [PATCH 2/4] Disable JPEG-XL (missing dependencies)
-
----
- Cargo.toml | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 18cbdf4..01da486 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -17,5 +17,10 @@ opt-level = 3
- 
- [workspace]
- resolver = "2"
--members = [  "loaders/*", "tests"]
-+members = [
-+    "loaders/glycin-heif",
-+    "loaders/glycin-image-rs",
-+    "loaders/glycin-svg",
-+    "tests",
-+]
- default-members = [ ]
--- 
-2.41.0
-
diff --git a/glycin-loaders.spec b/glycin-loaders.spec
index c6ce02e..c44dc35 100644
--- a/glycin-loaders.spec
+++ b/glycin-loaders.spec
@@ -36,8 +36,6 @@ URL:            https://gitlab.gnome.org/sophie-h/glycin
 Source0:        https://download.gnome.org/sources/glycin-loaders/0.1/glycin-loaders-%{tarball_version}.tar.xz
 # Fedora-packaged rust-image doesn't have openexr support
 Patch:          0001-Drop-OpenEXR-decoders-since-they-are-not-enabled-in-.patch
-# jxl rust wrapper isn't packaged yet
-Patch:          0002-Disable-JPEG-XL-missing-dependencies.patch
 %if 0%{?fedora}
 # Bump libheif-rs dep to the version that's in Fedora
 Patch:          0004-Bump-libheif-rs-dep-0.21.0.patch
@@ -76,7 +74,7 @@ rm -rf vendor
 
 %build
 %meson \
-  -Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-svg \
+  -Dloaders=%{!?rhel:glycin-heif,}glycin-image-rs,glycin-jxl,glycin-svg \
   -Dtest_skip_install=true \
   %{nil}