[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1114821: bookworm-pu: package rust-cbindgen-web/0.27.0-1~deb12u1



Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu

This update brings rust-cbindgen 0.27 to bookworm. It updates
rust-cbindgen-web, which should be fine as that is only used
by firefox-esr/thunderbird, which need the new version for the 140
update scheduled for next week, so basically there's no risk in
the update (the risk is that something doesn't work well for ff/tb
and we need to do another update, but it's contained).

I have tested this in order to build (and run) a backport of thunderbird
1:140.2.0esr-1 in bookworm.

I am attaching a debdiff from rust-cbindgen 0.27.0-1 after filtering
debian/vendor/ with

$ debdiff rust-cbindgen_0.27.0-1.dsc rust-cbindgen-web_0.27.0-1~deb12u1.dsc | filterdiff -x '*/debian/vendor/*'

I have already uploaded the package.

Cheers,
Emilio
diff -Nru rust-cbindgen-0.27.0/debian/cbindgen.manpages rust-cbindgen-web-0.27.0/debian/cbindgen.manpages
--- rust-cbindgen-0.27.0/debian/cbindgen.manpages	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/cbindgen.manpages	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/cbindgen.1
-
diff -Nru rust-cbindgen-0.27.0/debian/cbindgen-web.manpages rust-cbindgen-web-0.27.0/debian/cbindgen-web.manpages
--- rust-cbindgen-0.27.0/debian/cbindgen-web.manpages	1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-web-0.27.0/debian/cbindgen-web.manpages	2025-09-01 17:28:03.000000000 +0200
@@ -0,0 +1,2 @@
+debian/cbindgen.1
+
diff -Nru rust-cbindgen-0.27.0/debian/changelog rust-cbindgen-web-0.27.0/debian/changelog
--- rust-cbindgen-0.27.0/debian/changelog	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/changelog	2025-09-10 11:52:07.000000000 +0200
@@ -1,3 +1,18 @@
+rust-cbindgen-web (0.27.0-1~deb12u1) bookworm; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport to bookworm as rust-cbindgen-web. Since we're vendoring
+    the dependencies, we can't easily ship a librust-cbindgen-dev package
+    as it's dependencies won't be available, and there are build-rdeps
+    for that binary now so we can't just disable it.
+  * Vendor dependencies, they are not available in bookworm.
+  * Only build the cbindgen binary. Since we're vendoring the dependencies,
+    we can't easily ship a librust-cbindgen-web-dev package as its
+    dependencies won't be available.
+  * Build with rustc-web.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 10 Sep 2025 11:52:07 +0200
+
 rust-cbindgen (0.27.0-1) unstable; urgency=medium
 
   * Package cbindgen 0.27.0 from crates.io using debcargo 2.6.1
diff -Nru rust-cbindgen-0.27.0/debian/control rust-cbindgen-web-0.27.0/debian/control
--- rust-cbindgen-0.27.0/debian/control	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/control	2025-09-01 17:28:03.000000000 +0200
@@ -1,31 +1,13 @@
-Source: rust-cbindgen
+Source: rust-cbindgen-web
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 12),
  dh-cargo (>= 25),
  cargo:native,
- rustc:native (>= 1.74),
+ rustc-web:native (>= 1.74),
  libstd-rust-dev,
- librust-clap-4+default-dev (>= 4.3-~~),
- librust-heck-0.4+default-dev,
- librust-indexmap+default-dev (>= 1-~~),
- librust-log-0.4+default-dev,
- librust-proc-macro2-1+default-dev (>= 1.0.60-~~),
- librust-quote-1+default-dev,
- librust-serde-1+derive-dev (>= 1.0.103-~~),
- librust-serde-json-1+default-dev,
- librust-syn-2+clone-impls-dev (>= 2.0.64-~~),
- librust-syn-2+extra-traits-dev (>= 2.0.64-~~),
- librust-syn-2+fold-dev (>= 2.0.64-~~),
- librust-syn-2+full-dev (>= 2.0.64-~~),
- librust-syn-2+parsing-dev (>= 2.0.64-~~),
- librust-syn-2+printing-dev (>= 2.0.64-~~),
- librust-tempfile-3+default-dev,
- librust-toml-0.8+default-dev (>= 0.8.8-~~),
  help2man,
- librust-serial-test-dev,
  cython3,
- librust-pretty-assertions-dev
 Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Uploaders:
  Sylvestre Ledru <sylvestre@debian.org>
@@ -35,57 +17,7 @@
 X-Cargo-Crate: cbindgen
 Rules-Requires-Root: no
 
-Package: librust-cbindgen-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-heck-0.4+default-dev,
- librust-indexmap+default-dev (>= 1-~~),
- librust-log-0.4+default-dev,
- librust-proc-macro2-1+default-dev (>= 1.0.60-~~),
- librust-quote-1+default-dev,
- librust-serde-1+derive-dev (>= 1.0.103-~~),
- librust-serde-json-1+default-dev,
- librust-syn-2+clone-impls-dev (>= 2.0.64-~~),
- librust-syn-2+extra-traits-dev (>= 2.0.64-~~),
- librust-syn-2+fold-dev (>= 2.0.64-~~),
- librust-syn-2+full-dev (>= 2.0.64-~~),
- librust-syn-2+parsing-dev (>= 2.0.64-~~),
- librust-syn-2+printing-dev (>= 2.0.64-~~),
- librust-tempfile-3+default-dev,
- librust-toml-0.8+default-dev (>= 0.8.8-~~)
-Recommends:
- librust-cbindgen+clap-dev (= ${binary:Version})
-Provides:
- librust-cbindgen-0-dev (= ${binary:Version}),
- librust-cbindgen-0.27-dev (= ${binary:Version}),
- librust-cbindgen-0.27.0-dev (= ${binary:Version})
-Description: Generating C bindings to Rust code - Rust source code
- Source code for Debianized Rust crate "cbindgen"
-
-Package: librust-cbindgen+clap-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-cbindgen-dev (= ${binary:Version}),
- librust-clap-4+default-dev (>= 4.3-~~)
-Provides:
- librust-cbindgen+default-dev (= ${binary:Version}),
- librust-cbindgen-0+clap-dev (= ${binary:Version}),
- librust-cbindgen-0+default-dev (= ${binary:Version}),
- librust-cbindgen-0.27+clap-dev (= ${binary:Version}),
- librust-cbindgen-0.27+default-dev (= ${binary:Version}),
- librust-cbindgen-0.27.0+clap-dev (= ${binary:Version}),
- librust-cbindgen-0.27.0+default-dev (= ${binary:Version})
-Description: Generating C bindings to Rust code - feature "clap" and 1 more
- This metapackage enables feature "clap" for the Rust cbindgen crate, by pulling
- in any additional dependencies needed by that feature.
- .
- Additionally, this package also provides the "default" feature.
-
-Package: cbindgen
+Package: cbindgen-web
 Architecture: any
 Multi-Arch: allowed
 Section: utils
@@ -99,6 +31,8 @@
  ${cargo:Suggests}
 Provides:
  ${cargo:Provides}
+Conflicts: cbindgen
+Replaces: cbindgen
 Built-Using: ${cargo:Built-Using}
 XB-X-Cargo-Built-Using: ${cargo:X-Cargo-Built-Using}
 Description: Generates C bindings from Rust code
diff -Nru rust-cbindgen-0.27.0/debian/librust-cbindgen+clap-dev.lintian-overrides rust-cbindgen-web-0.27.0/debian/librust-cbindgen+clap-dev.lintian-overrides
--- rust-cbindgen-0.27.0/debian/librust-cbindgen+clap-dev.lintian-overrides	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/librust-cbindgen+clap-dev.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-librust-cbindgen+clap-dev binary: empty-rust-library-declares-provides *
\ No newline at end of file
diff -Nru rust-cbindgen-0.27.0/debian/patches/series rust-cbindgen-web-0.27.0/debian/patches/series
--- rust-cbindgen-0.27.0/debian/patches/series	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/patches/series	2025-09-01 17:23:40.000000000 +0200
@@ -1,3 +1,4 @@
 use-cython3-for-tests.patch
 relax-dep.diff
 fix-tests-permission-denied.patch
+vendor-deps-config.patch
diff -Nru rust-cbindgen-0.27.0/debian/patches/vendor-deps-config.patch rust-cbindgen-web-0.27.0/debian/patches/vendor-deps-config.patch
--- rust-cbindgen-0.27.0/debian/patches/vendor-deps-config.patch	1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-web-0.27.0/debian/patches/vendor-deps-config.patch	2025-09-01 17:23:35.000000000 +0200
@@ -0,0 +1,8 @@
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,5 @@
++[source.crates-io]
++replace-with = "vendored-sources"
++
++[source.vendored-sources]
++directory = "vendor"
diff -Nru rust-cbindgen-0.27.0/debian/rules rust-cbindgen-web-0.27.0/debian/rules
--- rust-cbindgen-0.27.0/debian/rules	2024-09-06 09:15:54.000000000 +0200
+++ rust-cbindgen-web-0.27.0/debian/rules	2025-09-01 17:28:03.000000000 +0200
@@ -2,11 +2,17 @@
 %:
 	dh $@ --buildsystem cargo
 
+execute_before_dh_auto_configure:
+	cp -a debian/vendor/ .
+
+execute_after_dh_clean:
+	rm -rf vendor/
+
 override_dh_auto_test:
 	dh_auto_test -- test --all
 
 override_dh_installman:
-	help2man debian/cbindgen/usr/bin/cbindgen > debian/cbindgen.1
+	help2man debian/cbindgen-web/usr/bin/cbindgen > debian/cbindgen.1
 	dh_installman -O--buildsystem=cargo
 
 execute_after_dh_testdir:
diff -Nru rust-cbindgen-0.27.0/debian/source/include-binaries rust-cbindgen-web-0.27.0/debian/source/include-binaries
--- rust-cbindgen-0.27.0/debian/source/include-binaries	1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-web-0.27.0/debian/source/include-binaries	2025-09-01 17:27:31.000000000 +0200
@@ -0,0 +1,16 @@
+debian/vendor/unicode-ident/tests/fst/xid_continue.fst
+debian/vendor/unicode-ident/tests/fst/xid_start.fst
+debian/vendor/pretty_assertions/examples/standard_assertion.png
+debian/vendor/pretty_assertions/examples/pretty_assertion.png
+debian/vendor/pretty_assertions/examples/pretty_assertion_v0_6_1.png
+debian/vendor/windows_i686_msvc/lib/windows.0.52.0.lib
+debian/vendor/toml_edit/tests/fixtures/invalid/control/rawstring-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/control/bare-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/control/string-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/control/multi-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/control/rawmulti-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/control/comment-null.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-key.stderr
+debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-comment.stderr
+debian/vendor/windows_aarch64_msvc/lib/windows.0.52.0.lib
+debian/vendor/windows_x86_64_msvc/lib/windows.0.52.0.lib
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/pretty_assertions/examples/pretty_assertion.png and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/pretty_assertions/examples/pretty_assertion.png differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/pretty_assertions/examples/pretty_assertion_v0_6_1.png and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/pretty_assertions/examples/pretty_assertion_v0_6_1.png differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/pretty_assertions/examples/standard_assertion.png and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/pretty_assertions/examples/standard_assertion.png differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/bare-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/bare-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/comment-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/comment-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/multi-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/multi-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/rawmulti-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/rawmulti-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/rawstring-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/rawstring-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/string-null.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/control/string-null.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-comment.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-comment.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-key.stderr and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/toml_edit/tests/fixtures/invalid/encoding/utf16-key.stderr differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/unicode-ident/tests/fst/xid_continue.fst and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/unicode-ident/tests/fst/xid_continue.fst differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/unicode-ident/tests/fst/xid_start.fst and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/unicode-ident/tests/fst/xid_start.fst differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/windows_aarch64_msvc/lib/windows.0.52.0.lib and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/windows_aarch64_msvc/lib/windows.0.52.0.lib differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/windows_i686_msvc/lib/windows.0.52.0.lib and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/windows_i686_msvc/lib/windows.0.52.0.lib differ
Binary files /tmp/cpP2hB5jgM/rust-cbindgen-0.27.0/debian/vendor/windows_x86_64_msvc/lib/windows.0.52.0.lib and /tmp/QdQbEr_e8y/rust-cbindgen-web-0.27.0/debian/vendor/windows_x86_64_msvc/lib/windows.0.52.0.lib differ

Reply to: