public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-pillow-jxl-plugin] f43: Update to 1.3.5
@ 2026-06-29 14:51 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-29 14:51 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/python-pillow-jxl-plugin
Branch : f43
Commit : cdc06235ab5a42c9fabe3c0067b6c28fe3885bc5
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-29T15:24:26+01:00
Stats  : +49/-13 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/python-pillow-jxl-plugin/c/cdc06235ab5a42c9fabe3c0067b6c28fe3885bc5?branch=f43

Log:
Update to 1.3.5

---
diff --git a/.gitignore b/.gitignore
index a1b36f9..3c4372c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /pillow_jxl_plugin-1.3.2.tar.gz
 /pillow_jxl_plugin-1.3.3.tar.gz
 /pillow_jxl_plugin-1.3.4.tar.gz
+/pillow-jpegxl-plugin-1.3.5.tar.gz

diff --git a/0001-Unconditionally-dynamically-link-libjxl.patch b/0001-Unconditionally-dynamically-link-libjxl.patch
index c27bc0f..a19e912 100644
--- a/0001-Unconditionally-dynamically-link-libjxl.patch
+++ b/0001-Unconditionally-dynamically-link-libjxl.patch
@@ -1,7 +1,7 @@
-From 665749f34f7b7c987325c0d0e848f689b7cd3452 Mon Sep 17 00:00:00 2001
+From fb32a0ea3a8399d1d7ddcac9b14008a0790050d1 Mon Sep 17 00:00:00 2001
 From: Fabio Valentini <decathorpe@gmail.com>
 Date: Sat, 22 Mar 2025 13:30:36 +0100
-Subject: [PATCH] Unconditionally dynamically link libjxl
+Subject: [PATCH 1/2] Unconditionally dynamically link libjxl
 
 ---
  Cargo.toml     |  4 +---
@@ -10,18 +10,18 @@ Subject: [PATCH] Unconditionally dynamically link libjxl
  3 files changed, 3 insertions(+), 55 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index d96dab8..22d12e5 100644
+index 82fb871..95f0939 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -2,7 +2,6 @@
  name = "pillow-jxl-plugin"
- version = "1.3.4"
+ version = "1.3.5"
  edition = "2021"
 -build = "build.rs"
  
  # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
  [lib]
-@@ -14,6 +13,5 @@ pyo3 = { version="0.25.1", features = ["extension-module"] }
+@@ -14,6 +13,5 @@ pyo3 = { version="0.26.0", features = ["extension-module", "generate-import-lib"
  jpegxl-rs = { version="0.11.2", default-features = false }
  
  [features]
@@ -91,7 +91,7 @@ index e8f0895..4eddb1f 100644
 -    }
  }
 diff --git a/pyproject.toml b/pyproject.toml
-index a76ac34..f64afba 100644
+index 11dc6fa..dd9e8bc 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -31,4 +31,4 @@ dev = ["numpy", "pytest", "pyexiv2"]
@@ -101,5 +101,5 @@ index a76ac34..f64afba 100644
 -features = ["pyo3/extension-module", "vendored"]
 +features = ["pyo3/extension-module"]
 -- 
-2.50.1
+2.54.0
 

diff --git a/0002-Downstream-only-patch-out-the-generate-import-lib-fe.patch b/0002-Downstream-only-patch-out-the-generate-import-lib-fe.patch
new file mode 100644
index 0000000..6c77a98
--- /dev/null
+++ b/0002-Downstream-only-patch-out-the-generate-import-lib-fe.patch
@@ -0,0 +1,31 @@
+From bec7e8c03bd844c9444623f7df38d0c80847371b Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sat, 20 Jun 2026 22:02:36 +0100
+Subject: [PATCH 2/2] Downstream-only: patch out the generate-import-lib
+ feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is only relevant on Windows, and depends on the corresponding pyo3
+feature – which is not packaged for that reason.
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 95f0939..b3c362a 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -9,7 +9,7 @@ name = "pillow_jxl"
+ crate-type = ["cdylib"]
+ 
+ [dependencies]
+-pyo3 = { version="0.26.0", features = ["extension-module", "generate-import-lib"] }
++pyo3 = { version="0.26.0", features = ["extension-module"] }
+ jpegxl-rs = { version="0.11.2", default-features = false }
+ 
+ [features]
+-- 
+2.54.0
+

diff --git a/python-pillow-jxl-plugin.spec b/python-pillow-jxl-plugin.spec
index 140bba2..5a037ef 100644
--- a/python-pillow-jxl-plugin.spec
+++ b/python-pillow-jxl-plugin.spec
@@ -1,7 +1,5 @@
-%global pypi_name pillow_jxl_plugin
-
 Name:           python-pillow-jxl-plugin
-Version:        1.3.4
+Version:        1.3.5
 Release:        %autorelease
 Summary:        Pillow plugin for JPEG-XL
 # GPL-3.0-or-later for code
@@ -16,11 +14,17 @@ License:        GPL-3.0-or-later AND MIT AND (Apache-2.0 OR MIT) AND (Unlicense 
 # LICENSE.dependencies contains a full license breakdown
 
 URL:            https://github.com/Isotr0py/pillow-jpegxl-plugin
-Source:         %{pypi_source %{pypi_name}}
+Source:         %{url}/archive/v%{version}/pillow-jpegxl-plugin-%{version}.tar.gz
 
 # drop custom build system that is unnecessary and only breaks stuff
 Patch:          0001-Unconditionally-dynamically-link-libjxl.patch
 
+# Downstream-only: patch out the generate-import-lib feature
+#
+# It is only relevant on Windows, and depends on the corresponding pyo3
+# feature – which is not packaged for that reason.
+Patch:          0002-Downstream-only-patch-out-the-generate-import-lib-fe.patch
+
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  python3-devel
 BuildRequires:  jpegxl-devel
@@ -37,7 +41,7 @@ Summary:        Pillow plugin for JPEG-XL
 %description -n python3-pillow-jxl-plugin %{_description}
 
 %prep
-%autosetup -n %{pypi_name}-%{version} -p1
+%autosetup -n pillow-jpegxl-plugin-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires

diff --git a/sources b/sources
index 7bed67b..6b63dd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pillow_jxl_plugin-1.3.4.tar.gz) = 9aaf3457ef07d0d0467f5d54770c8cb5df46357a3fcf6c6c33d702ec07aeca2f17d952647726ab91cde039d34e6478de609fb73ec669d72abe083c1ecc4a9f40
+SHA512 (pillow-jpegxl-plugin-1.3.5.tar.gz) = 96cd759800b45d00b586e0b6f804f9fd600b31f63ff7030f928b62cb6b68e132348706bde0de28f0fab666c27f2c49e3694385f6edb6ce1fb557ea59bc4d31a9

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-29 14:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-29 14:51 [rpms/python-pillow-jxl-plugin] f43: Update to 1.3.5 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox