Your message dated Sat, 23 Nov 2024 13:51:43 +0000
with message-id <e1teqy3-008llz...@fasolo.debian.org>
and subject line Bug#1087401: fixed in rust-leptonica-sys 0.4.8-3
has caused the Debian Bug report #1087401,
regarding rust-leptonica-sys: Upcoming bindgen update
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1087401: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087401
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: rust-leptonica-sys
Version: 0.4.8-2
Severity: normal
Tags: patch
X-Debbugs-Cc: noisyc...@tutanota.com
Hi Jonas,
bindgen is about to be updated from v0.66 to v0.70. The latter has been in
experimental for a few days. I tested that rust-leptonica-sys builds and its
autopkgtests pass in unstable using the updated version.
In its build.rs, rust-leptonica-sys uses bindgen::CargoCallbacks, which is
marked as deprecated starting from bindgen v0.69 [1] but is still accepted by
v0.70. To bump bindgen, one can either keep bindgen::CargoCallbacks and wait
for it to break on a future update, or start using its replacement,
bindgen::CargoCallbacks::new(), which however was only introduced in v0.69, so
it's not compatible with older versions. I am attaching patches for both these
approaches, named "backwards" and "forwards" respectively for their
compatibility. I tested them both, of course, although they are functionally
equivalent.
Best,
NC
[1] https://github.com/rust-lang/rust-bindgen/blob/main/CHANGELOG.md#changed-6
>From 8c2a5e022ce9afef26c2429f000b33f78faf9511 Mon Sep 17 00:00:00 2001
From: NoisyCoil <noisyc...@tutanota.com>
Date: Mon, 11 Nov 2024 01:03:33 +0100
Subject: [PATCH] Bump bindgen dependency to v0.70
---
debian/control | 4 ++--
debian/patches/1001_bindgen.patch | 6 +++---
debian/patches/2002_no_windows.patch | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index aec9904..174cf3f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Build-Depends:
debhelper-compat (= 13),
dh-sequence-rust,
libleptonica-dev <!nocheck>,
- librust-bindgen-0+default-dev (<< 0.67) <!nocheck>,
+ librust-bindgen-0+default-dev (<< 0.71) <!nocheck>,
librust-bindgen-0+default-dev (>= 0.64) <!nocheck>,
librust-pkg-config-0.3+default-dev <!nocheck>,
Maintainer: Jonas Smedegaard <d...@jones.dk>
@@ -20,7 +20,7 @@ Architecture: all
Multi-Arch: foreign
Depends:
libleptonica-dev,
- librust-bindgen-0+default-dev (<< 0.67),
+ librust-bindgen-0+default-dev (<< 0.71),
librust-bindgen-0+default-dev (>= 0.64),
librust-pkg-config-0.3+default-dev,
${misc:Depends},
diff --git a/debian/patches/1001_bindgen.patch
b/debian/patches/1001_bindgen.patch
index a506aa3..27ba7a5 100644
--- a/debian/patches/1001_bindgen.patch
+++ b/debian/patches/1001_bindgen.patch
@@ -1,6 +1,6 @@
-Description: accept newer crate bindgen 0.66.1
+Description: accept newer crate bindgen up to 0.70
Author: Jonas Smedegaard <d...@jones.dk>
-Last-Update: 2023-12-04
+Last-Update: 2024-11-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
@@ -10,7 +10,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
[build-dependencies]
-bindgen = "0.64.0"
-+bindgen = ">= 0.64, < 0.67"
++bindgen = ">= 0.64, < 0.71"
[target.'cfg(windows)'.build-dependencies]
vcpkg = "0.2.15"
diff --git a/debian/patches/2002_no_windows.patch
b/debian/patches/2002_no_windows.patch
index 494d6a8..d723fd9 100644
--- a/debian/patches/2002_no_windows.patch
+++ b/debian/patches/2002_no_windows.patch
@@ -8,7 +8,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
+++ b/Cargo.toml
@@ -14,8 +14,5 @@
[build-dependencies]
- bindgen = ">= 0.64, < 0.67"
+ bindgen = ">= 0.64, < 0.71"
-[target.'cfg(windows)'.build-dependencies]
-vcpkg = "0.2.15"
--
2.45.2
>From 292badccf23cb8e22c6c196494665ce1e2a24d5c Mon Sep 17 00:00:00 2001
From: NoisyCoil <noisyc...@tutanota.com>
Date: Mon, 11 Nov 2024 01:03:33 +0100
Subject: [PATCH] Bump bindgen dependency to v0.70
---
debian/control | 8 ++++----
debian/patches/1001_bindgen.patch | 17 ++++++++++++++---
debian/patches/2002_no_windows.patch | 2 +-
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/debian/control b/debian/control
index aec9904..c6e4d2e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Build-Depends:
debhelper-compat (= 13),
dh-sequence-rust,
libleptonica-dev <!nocheck>,
- librust-bindgen-0+default-dev (<< 0.67) <!nocheck>,
- librust-bindgen-0+default-dev (>= 0.64) <!nocheck>,
+ librust-bindgen-0+default-dev (<< 0.71) <!nocheck>,
+ librust-bindgen-0+default-dev (>= 0.69) <!nocheck>,
librust-pkg-config-0.3+default-dev <!nocheck>,
Maintainer: Jonas Smedegaard <d...@jones.dk>
Standards-Version: 4.7.0
@@ -20,8 +20,8 @@ Architecture: all
Multi-Arch: foreign
Depends:
libleptonica-dev,
- librust-bindgen-0+default-dev (<< 0.67),
- librust-bindgen-0+default-dev (>= 0.64),
+ librust-bindgen-0+default-dev (<< 0.71),
+ librust-bindgen-0+default-dev (>= 0.69),
librust-pkg-config-0.3+default-dev,
${misc:Depends},
Provides:
diff --git a/debian/patches/1001_bindgen.patch
b/debian/patches/1001_bindgen.patch
index a506aa3..33afede 100644
--- a/debian/patches/1001_bindgen.patch
+++ b/debian/patches/1001_bindgen.patch
@@ -1,6 +1,6 @@
-Description: accept newer crate bindgen 0.66.1
+Description: accept newer crate bindgen 0.70.1
Author: Jonas Smedegaard <d...@jones.dk>
-Last-Update: 2023-12-04
+Last-Update: 2024-11-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
@@ -10,7 +10,18 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
[build-dependencies]
-bindgen = "0.64.0"
-+bindgen = ">= 0.64, < 0.67"
++bindgen = ">= 0.69, < 0.71"
[target.'cfg(windows)'.build-dependencies]
vcpkg = "0.2.15"
+--- a/build.rs
++++ b/build.rs
+@@ -85,7 +85,7 @@
+ }
+
+ let bindings = bindings
+- .parse_callbacks(Box::new(bindgen::CargoCallbacks))
++ .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
+ .generate()
+ .expect("Unable to generate bindings");
+
diff --git a/debian/patches/2002_no_windows.patch
b/debian/patches/2002_no_windows.patch
index 494d6a8..6b9a514 100644
--- a/debian/patches/2002_no_windows.patch
+++ b/debian/patches/2002_no_windows.patch
@@ -8,7 +8,7 @@ This patch header follows DEP-3:
http://dep.debian.net/deps/dep3/
+++ b/Cargo.toml
@@ -14,8 +14,5 @@
[build-dependencies]
- bindgen = ">= 0.64, < 0.67"
+ bindgen = ">= 0.69, < 0.71"
-[target.'cfg(windows)'.build-dependencies]
-vcpkg = "0.2.15"
--
2.45.2
--- End Message ---
--- Begin Message ---
Source: rust-leptonica-sys
Source-Version: 0.4.8-3
Done: Jonas Smedegaard <d...@jones.dk>
We believe that the bug you reported is fixed in the latest version of
rust-leptonica-sys, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1087...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <d...@jones.dk> (supplier of updated rust-leptonica-sys
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 23 Nov 2024 14:34:05 +0100
Source: rust-leptonica-sys
Architecture: source
Version: 0.4.8-3
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <d...@jones.dk>
Changed-By: Jonas Smedegaard <d...@jones.dk>
Closes: 1087401
Changes:
rust-leptonica-sys (0.4.8-3) unstable; urgency=medium
.
* autopkgtest-depend on dh-rust (not dh-cargo)
* stop mention dh-cargo in long description
* update patch 1001 to cover newer branches of crate bindgen;
tighten build-dependency for crate bindgen;
closes: bug#1087401, thanks to NoisyCoil
* declare crate-related build-dependencies unconditionally,
i.e. drop broken nocheck annotations
Checksums-Sha1:
b258791d9b89143fefa59497920e38965fe9828d 2272 rust-leptonica-sys_0.4.8-3.dsc
d5ec25b0dd263a2128a8fafeba95bd3341ec2075 4328
rust-leptonica-sys_0.4.8-3.debian.tar.xz
8c21cf057537447627e64dd9660d0c092a6f1a39 11496
rust-leptonica-sys_0.4.8-3_amd64.buildinfo
Checksums-Sha256:
e4130cf430c1e37d6df8b615e33868dfc07bee9c71d3f05a97daec94e318f98a 2272
rust-leptonica-sys_0.4.8-3.dsc
6a0b411c3f8bc6bec218addb894812c274682b6770eff648e80094a946a56a4f 4328
rust-leptonica-sys_0.4.8-3.debian.tar.xz
4169e60bf28f53d618c6d98ff8b1304bff53e0a21cf3757f9d9a2f4e523d8df0 11496
rust-leptonica-sys_0.4.8-3_amd64.buildinfo
Files:
3e78832072f85fbfb5f4aac621d78384 2272 rust optional
rust-leptonica-sys_0.4.8-3.dsc
2bbaf2fb194ff6fd93b82b985d7d0f0e 4328 rust optional
rust-leptonica-sys_0.4.8-3.debian.tar.xz
fefdf645a9661ae8447d90ce3973dec2 11496 rust optional
rust-leptonica-sys_0.4.8-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
wsG7BAEBCgBvBYJnQdpgCRAsfDFGwaABIUcUAAAAAAAeACBzYWx0QG5vdGF0aW9u
cy5zZXF1b2lhLXBncC5vcmehujcq8mR/JKukpKayj4vPlTj4NNkIvHUxBYBfvO69
eRYhBJ/j6cNmkaaf9TzGhCx8MUbBoAEhAAAuww/+IRRg0EPR0UTc/X5bmZHNonP+
EjP5FBEoEG5Oma2EomQLWeoncoJDHfNSIuRzZBJ+5wvndgTJZlxb1m6WtupUve7H
EyKYSpRE5pLWg5zFFoof8opBD0/QpAwwk6tybYU7KRTdGNmmG3+BWz2ZJ0Slib3W
IsqvJ2HrYxWaFoEXrv+rN3GppUs75VDJPmQiXEjV9s8wO8z+D228W9+colu2s5BS
aXp1IARah0z97oDZv6rFCIepkNFxxbOUC2hrvY++G7t3YZcbMAMtyWQWV9eV8Nej
aMlIZt60zYow1L8RcJpkoOKpPPkdo6Wvs2inKv31FxFCt1hjd1H1Ch6Iwr+YbdQ9
saTmwOnHWcR9RHzAlHqFTXEvH9DX3vOadlA1Vx3a4Odu+Aky9kw5cxefrRD0iIG8
R+La6hupNRujQ2Y3rg9rZgI+KjmTbpyhmwb3ttzj8BFYqI10Aa2ecggW0u/W8D1a
jek0KKUm549IF+ebu1/vQbs9qQg5v5NhqujV+mfG7UG5vCsrvpi76qUwee42vRek
UxtkW90EqLAhwbWiVJd/M0M6hIgmabzLseki0AfjEaqG05PmJDxHJG44MacmZis3
WsFdOIO+pwegGkucPeA5FuoG+VjEqYT729O/bUPdlODaqC/PIbS4m2WK5Lmf7jI3
OPM/ZQxXJ3lMYUci6aQ=
=kcqR
-----END PGP SIGNATURE-----
pgphqoCPPLfh1.pgp
Description: PGP signature
--- End Message ---
