public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-libdeflate-sys] epel10.3: Update to version 1.26.1; Fixes RHBZ#2536014
Date: Thu, 17 Sep 2026 13:54:47 GMT	[thread overview]
Message-ID: <178965328763.1.5343485243955300883.rpms-rust-libdeflate-sys-1d76aba29642@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/rust-libdeflate-sys
            Branch : epel10.3
            Commit : 1d76aba2964224b78889926bfc44f88673365e3a
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-09-17T14:45:14+01:00
            Stats  : +46/-45 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/rust-libdeflate-sys/c/1d76aba2964224b78889926bfc44f88673365e3a?branch=epel10.3

            Log:
            Update to version 1.26.1; Fixes RHBZ#2536014

- Simplify patching for uncondional dynamic linking of libdeflate

---
diff --git a/libdeflate-sys-always-dynamic.patch b/libdeflate-sys-always-dynamic.patch
new file mode 100644
index 0000000..52a16a7
--- /dev/null
+++ b/libdeflate-sys-always-dynamic.patch
@@ -0,0 +1,11 @@
+diff -Naur a/build.rs b/build.rs
+--- a/build.rs	2006-07-24 02:21:28.000000000 +0100
++++ b/build.rs	2026-09-17 14:40:39.949565048 +0100
+@@ -5,7 +5,6 @@
+ fn main() {
+     let dst = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+ 
+-    #[cfg(feature = "dynamic")]
+     if pkg_config::Config::new()
+         .print_system_libs(false)
+         .cargo_metadata(true)

diff --git a/libdeflate-sys-fix-metadata.diff b/libdeflate-sys-fix-metadata.diff
index b79d358..2c50d9d 100644
--- a/libdeflate-sys-fix-metadata.diff
+++ b/libdeflate-sys-fix-metadata.diff
@@ -1,5 +1,5 @@
---- libdeflate-sys-1.26.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ libdeflate-sys-1.26.0/Cargo.toml	2026-08-23T10:31:43.000070+00:00
+--- libdeflate-sys-1.26.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ libdeflate-sys-1.26.1/Cargo.toml	2026-09-17T13:44:00.189761+00:00
 @@ -41,7 +41,7 @@
  repository = "https://github.com/libdeflater/libdeflater"
  

diff --git a/rust-libdeflate-sys.spec b/rust-libdeflate-sys.spec
index 6c88cd2..14ebd19 100644
--- a/rust-libdeflate-sys.spec
+++ b/rust-libdeflate-sys.spec
@@ -5,7 +5,7 @@
 %global crate libdeflate-sys
 
 Name:           rust-libdeflate-sys
-Version:        1.26.0
+Version:        1.26.1
 Release:        %autorelease
 Summary:        Bindings to libdeflate for DEFLATE
 
@@ -14,9 +14,14 @@ URL:            https://crates.io/crates/libdeflate-sys
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
 # * Make the dependency on crate(pkg-config) non-optional instead of associating
-#   it with the “dynamic” feature, since we patch the crate to always link
-#   dynamically with the system libdeflate, regardless of the selected features.
+#   it with the “dynamic” feature; see also libdeflate-sys-always-dynamic.patch,
+#   which ensures build.rs always links dynamically with the system libdeflate,
+#   regardless of the selected features.
 Patch:          libdeflate-sys-fix-metadata.diff
+# * Downstream-only: Always link dynamically with the system libdeflate,
+#   regardless of the selected features. This works together with the metadata
+#   patch that makes the dependency on crate(pkg-config) non-optional.
+Patch10:        libdeflate-sys-always-dynamic.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  pkgconfig(libdeflate)
@@ -83,19 +88,6 @@ use the "freestanding" feature of the "%{crate}" crate.
 %autosetup -n %{crate}-%{version} -p1
 # Remove the bundled copy of libdeflate.
 rm --recursive --verbose libdeflate
-# Make libdeflate detection with pkg-config unconditional.
-sed --regexp-extended --in-place \
-    's@^([[:blank:]]*)(#\[cfg\(feature *= *"dynamic"\)\])@\1// \2@' build.rs
-# Don’t require an exact version match. We would *like* the versions to stay
-# aligned, but we don’t *need* to update libdeflate and
-# rust-libdeflate-sys/rust-libdeflater concurrently.
-sed --regexp-extended --in-place \
-    's@^([[:blank:]]*)(\.exactly_version\()@\1// \2@' build.rs
-# The above two sed-patches effectively revert “Dynamic Linking Constraints”,
-# https://github.com/adamkewley/libdeflater/pull/32. Using sed instead of a
-# patch file keeps us from having to update the patch every time the version
-# number changes.
-
 %cargo_prep
 
 %generate_buildrequires

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 3e53811..7bdd542 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,39 +1,37 @@
-[requires]
-build = [
-    "pkgconfig(libdeflate)"
-]
-lib = [
-    "pkgconfig(libdeflate)"
-]
-
 [package]
 cargo-toml-patch-comments = [
     """\
 Make the dependency on crate(pkg-config) non-optional instead of associating it \
-with the “dynamic” feature, since we patch the crate to always link dynamically \
-with the system libdeflate, regardless of the selected features.\
+with the “dynamic” feature; see also libdeflate-sys-always-dynamic.patch, which \
+ensures build.rs always links dynamically with the system libdeflate, \
+regardless of the selected features.\
 """,
 ]
 license-files.exclude = [
     "libdeflate/COPYING"
 ]
 
+[[package.extra-patches]]
+number = 10
+file = "libdeflate-sys-always-dynamic.patch"
+comments = [
+    """\
+Downstream-only: Always link dynamically with the system libdeflate, regardless \
+of the selected features. This works together with the metadata patch that \
+makes the dependency on crate(pkg-config) non-optional.\
+""",
+]
+
+[requires]
+build = [
+    "pkgconfig(libdeflate)"
+]
+lib = [
+    "pkgconfig(libdeflate)"
+]
+
 [scripts.prep]
 pre = [
-    '''
-# Remove the bundled copy of libdeflate.
-rm --recursive --verbose libdeflate
-# Make libdeflate detection with pkg-config unconditional.
-sed --regexp-extended --in-place \
-    's@^([[:blank:]]*)(#\[cfg\(feature *= *"dynamic"\)\])@\1// \2@' build.rs
-# Don’t require an exact version match. We would *like* the versions to stay
-# aligned, but we don’t *need* to update libdeflate and
-# rust-libdeflate-sys/rust-libdeflater concurrently.
-sed --regexp-extended --in-place \
-    's@^([[:blank:]]*)(\.exactly_version\()@\1// \2@' build.rs
-# The above two sed-patches effectively revert “Dynamic Linking Constraints”,
-# https://github.com/adamkewley/libdeflater/pull/32. Using sed instead of a
-# patch file keeps us from having to update the patch every time the version
-# number changes.
-'''
+    "# Remove the bundled copy of libdeflate.",
+    "rm --recursive --verbose libdeflate",
 ]

diff --git a/sources b/sources
index b07f520..f254bb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libdeflate-sys-1.26.0.crate) = 386f640681f9dcb441255e0623a1f938bb4fff473f6614d6b799fddb0cbdf8bb49f29f23705acefbc95b8f2bb2cdc1712321601c9c86eac97193eb035c7e45dd
+SHA512 (libdeflate-sys-1.26.1.crate) = 4e6a06e1634c9b3b9828a886398ba084d90890c0d523e0643995f2f6d92b9ee010245eb3d1149a6a6b34c11c8d6d13909450a76d673eba3669ce297dc43587a5

                 reply	other threads:[~2026-09-17 13:54 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=178965328763.1.5343485243955300883.rpms-rust-libdeflate-sys-1d76aba29642@fedoraproject.org \
    --to=code@musicinmybrain.net \
    --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