public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Fabio Valentini <decathorpe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/glycin] rawhide: Update to version 2.2.beta
Date: Wed, 12 Aug 2026 20:18:45 GMT	[thread overview]
Message-ID: <178656592502.1.778435418630466652.rpms-glycin-05a1b92499a0@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/glycin
Branch : rawhide
Commit : 05a1b92499a04823e2ebf0c01f52c314bf0a4ecd
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2026-08-11T17:07:06+02:00
Stats  : +71/-17 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/glycin/c/05a1b92499a04823e2ebf0c01f52c314bf0a4ecd?branch=rawhide

Log:
Update to version 2.2.beta

---
diff --git a/.gitignore b/.gitignore
index bdfe3ef..32bf1d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@
 /glycin-2.1.5-vendor.tar.xz
 /glycin-2.2.alpha.5.tar.xz
 /glycin-2.2.alpha.5-vendor.tar.xz
+/glycin-2.2.beta.tar.xz
+/glycin-2.2.beta-vendor.tar.xz

diff --git a/0001-fix-invalid-crate-manifest-for-tests-workspace-membe.patch b/0001-fix-invalid-crate-manifest-for-tests-workspace-membe.patch
index ad141c1..a280d5b 100644
--- a/0001-fix-invalid-crate-manifest-for-tests-workspace-membe.patch
+++ b/0001-fix-invalid-crate-manifest-for-tests-workspace-membe.patch
@@ -1,14 +1,14 @@
-From aca758f4c3c737662c765bd69d26b646118d12c6 Mon Sep 17 00:00:00 2001
+From 0c961becebb52b9e7077e4217b7dfdbcd6730b1b Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Sat, 8 Mar 2025 18:43:41 +0100
-Subject: [PATCH 1/4] fix invalid crate manifest for tests workspace member
+Subject: [PATCH 1/5] fix invalid crate manifest for tests workspace member
 
 ---
  tests/Cargo.toml | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/tests/Cargo.toml b/tests/Cargo.toml
-index 1b652d0..8b1b251 100644
+index 35d15cb..4f9fe76 100644
 --- a/tests/Cargo.toml
 +++ b/tests/Cargo.toml
 @@ -56,4 +56,9 @@ name = "processor-loader"

diff --git a/0002-Replace-serde_yaml_ng-with-equivalent-serde_yaml-dep.patch b/0002-Replace-serde_yaml_ng-with-equivalent-serde_yaml-dep.patch
index ca02fee..625adc8 100644
--- a/0002-Replace-serde_yaml_ng-with-equivalent-serde_yaml-dep.patch
+++ b/0002-Replace-serde_yaml_ng-with-equivalent-serde_yaml-dep.patch
@@ -1,7 +1,7 @@
-From 5b77e58d3698c151e4cb80897752d0788a3ede7e Mon Sep 17 00:00:00 2001
+From 9a24fda91e3a4d5cdb581e16072edbb4719fca5c Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Mon, 24 Mar 2025 21:14:36 +0100
-Subject: [PATCH 2/4] Replace serde_yaml_ng with equivalent serde_yaml
+Subject: [PATCH 2/5] Replace serde_yaml_ng with equivalent serde_yaml
  dependency
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 2/4] Replace serde_yaml_ng with equivalent serde_yaml
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/tests/Cargo.toml b/tests/Cargo.toml
-index 8b1b251..80a3ca5 100644
+index 4f9fe76..38b5d07 100644
 --- a/tests/Cargo.toml
 +++ b/tests/Cargo.toml
 @@ -26,9 +26,7 @@ tokio.workspace = true

diff --git a/0003-drop-unused-benchmark-only-criterion-dev-dependency.patch b/0003-drop-unused-benchmark-only-criterion-dev-dependency.patch
index a73bca4..ed6994f 100644
--- a/0003-drop-unused-benchmark-only-criterion-dev-dependency.patch
+++ b/0003-drop-unused-benchmark-only-criterion-dev-dependency.patch
@@ -1,7 +1,7 @@
-From d10e478b06b7de1db45364500958de7bc244c234 Mon Sep 17 00:00:00 2001
+From c7d516480b43a7303c34f44f6f54f2eb07d36f79 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Sat, 8 Aug 2026 00:03:40 +0200
-Subject: [PATCH 3/4] drop unused, benchmark-only criterion dev-dependency
+Subject: [PATCH 3/5] drop unused, benchmark-only criterion dev-dependency
 
 ---
  Cargo.toml         | 1 -
@@ -9,12 +9,12 @@ Subject: [PATCH 3/4] drop unused, benchmark-only criterion dev-dependency
  2 files changed, 2 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 694bf16..8df03db 100644
+index ddcd0c6..ff1f7d6 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -41,7 +41,6 @@ async-task = "4.0.0"
- bitflags = "2.9.0"
+@@ -42,7 +42,6 @@ bitflags = "2.9.0"
  blocking = "1.6.1"
+ bytemuck = { version = "1.25", features = ["extern_crate_std"] }
  cairo-rs = "0.22.0"
 -criterion = "0.8.0"
  env_logger = { version = "0.11.0", default-features = false, features = [

diff --git a/0004-fix-discovery-of-path-dependencies-that-were-not-wor.patch b/0004-fix-discovery-of-path-dependencies-that-were-not-wor.patch
index bcaff58..4c79e34 100644
--- a/0004-fix-discovery-of-path-dependencies-that-were-not-wor.patch
+++ b/0004-fix-discovery-of-path-dependencies-that-were-not-wor.patch
@@ -1,7 +1,7 @@
-From 64b0114bc03814991a0b6af4e8d835c0dfd7d7b8 Mon Sep 17 00:00:00 2001
+From e99c3fd971c15586e7427e32884902deb7ae0dc3 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Sat, 8 Aug 2026 00:19:03 +0200
-Subject: [PATCH 4/4] fix discovery of path dependencies that were not
+Subject: [PATCH 4/5] fix discovery of path dependencies that were not
  workspace members
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 4/4] fix discovery of path dependencies that were not
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 8df03db..931afe9 100644
+index ff1f7d6..0111d1a 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -18,7 +18,7 @@ zvariant.opt-level = "z"

diff --git a/0005-Backport-changes-to-support-gufo-0.5.0-beta.1.patch b/0005-Backport-changes-to-support-gufo-0.5.0-beta.1.patch
new file mode 100644
index 0000000..246c9b7
--- /dev/null
+++ b/0005-Backport-changes-to-support-gufo-0.5.0-beta.1.patch
@@ -0,0 +1,49 @@
+From cb84bf375f295328a8378047d6f97714c1245636 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Tue, 11 Aug 2026 16:47:13 +0200
+Subject: [PATCH 5/5] Backport changes to support gufo 0.5.0-beta.1
+
+---
+ Cargo.toml                            | 10 +++++-----
+ glycin-loaders/glycin-jxl/src/main.rs |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 0111d1a..e76dfb1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -71,11 +71,11 @@ glycin-thumbnailer = { version = "2.2.0-alpha.7", path = "glycin-thumbnailer/",
+ glycin-utils = { version = "5.0.0-alpha.1",  default-features = false }
+ glycin-external = { version = "4.0.0-alpha.7",  default-features = false }
+ gly = { package = "libglycin-rebind", version = "0.2.0-beta", path = "libglycin-rebind/libglycin-rebind/" }
+-gufo = { version = "0.5.0-alpha.3" }
+-gufo-common = { version = "2.0.0-alpha.2", features = ["serde"] }
+-gufo-exif = { version = "0.5.0-alpha.3" }
+-gufo-jpeg = { version = "0.5.0-alpha.2" }
+-gufo-svg = { version = "0.5.0-alpha.2" }
++gufo = { version = "0.5.0-beta.1" }
++gufo-common = { version = "2.0.0-beta.1", features = ["serde"] }
++gufo-exif = { version = "0.5.0-beta.1" }
++gufo-jpeg = { version = "0.5.0-beta.1" }
++gufo-svg = { version = "0.5.0-beta.1" }
+ half = "2.4.1"
+ hayro-jpeg2000 = "0.3.2"
+ image = { version = "0.25.9", default-features = false }
+diff --git a/glycin-loaders/glycin-jxl/src/main.rs b/glycin-loaders/glycin-jxl/src/main.rs
+index 872084e..c233bcd 100644
+--- a/glycin-loaders/glycin-jxl/src/main.rs
++++ b/glycin-loaders/glycin-jxl/src/main.rs
+@@ -299,8 +299,8 @@ fn color_encoding_to_cicp(c: JxlColorEncoding) -> Option<Cicp> {
+         JxlTransferFunction::Linear => TransferCharacteristics::Linear,
+         JxlTransferFunction::HLG => TransferCharacteristics::Hlg,
+         JxlTransferFunction::PQ => TransferCharacteristics::Pq,
+-        JxlTransferFunction::SRGB => TransferCharacteristics::Gamma24,
+-        JxlTransferFunction::BT709 => TransferCharacteristics::Gamma22,
++        JxlTransferFunction::SRGB => TransferCharacteristics::Srgb,
++        JxlTransferFunction::BT709 => TransferCharacteristics::Bt709,
+         JxlTransferFunction::DCI => TransferCharacteristics::Dci,
+         _ => {
+             return None;
+-- 
+2.55.0
+

diff --git a/glycin.spec b/glycin.spec
index 5f2a941..839fefa 100644
--- a/glycin.spec
+++ b/glycin.spec
@@ -5,7 +5,7 @@
 %bcond bundled_rust_deps %{defined rhel}
 
 Name:           glycin
-Version:        2.2~alpha.5
+Version:        2.2~beta
 Release:        %autorelease
 Summary:        Sandboxed image rendering
 
@@ -72,6 +72,9 @@ Patch:          0001-fix-invalid-crate-manifest-for-tests-workspace-membe.patch
 Patch:          0002-Replace-serde_yaml_ng-with-equivalent-serde_yaml-dep.patch
 Patch:          0003-drop-unused-benchmark-only-criterion-dev-dependency.patch
 Patch:          0004-fix-discovery-of-path-dependencies-that-were-not-wor.patch
+# backport https://gitlab.gnome.org/GNOME/glycin/-/commit/b918acf
+# to account for https://github.com/gufo-rs/gufo/commit/a8a4905
+Patch:          0005-Backport-changes-to-support-gufo-0.5.0-beta.1.patch
 
 %if 0%{?rhel}
 BuildRequires:  rust-toolset

diff --git a/sources b/sources
index 66d04db..8fcfd1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (glycin-2.2.alpha.5.tar.xz) = 7c9e081a582a04cdeab8e8b3bb1a286ace1d9b99703b0e7c52e30bf769293643f599ee690abf99dc3822e03b815f8b9c4e561daaac1f5c223aa18738f0e2ee3d
-SHA512 (glycin-2.2.alpha.5-vendor.tar.xz) = 5bc29e37d6145a5a499d6f37ace7ee39a0fe9e136cbfd0b12b2323c350c9dcb752110a4ff12d232411ac5b94af73ad70fc570b4d8508f09357988040a029d5e1
+SHA512 (glycin-2.2.beta.tar.xz) = e6b9ba38e3cd8f121f344f53fc8643c29f679d1347973a89d517d6ef2712364849dafdf55e7143a9a49f13282539ad2c34fb0176bb083a01458feda02a3efdb8
+SHA512 (glycin-2.2.beta-vendor.tar.xz) = 2dec35366ef2a2d3c4de36ed2271614fbfe050dced1006e7371b3f74a68cfc3c53c64bb34dee64937e89c52b2067e9b759a4fdd99d2191fe98d646c0a9eae886

                 reply	other threads:[~2026-08-12 20:18 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178656592502.1.778435418630466652.rpms-glycin-05a1b92499a0@fedoraproject.org \
    --to=decathorpe@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox