summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-use-local-css.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
commitc29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch)
treea2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/d-bootstrap-use-local-css.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-debian/1.76.0+dfsg1-1.tar.xz
rustc-debian/1.76.0+dfsg1-1.zip
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-use-local-css.patch')
-rw-r--r--debian/patches/d-bootstrap-use-local-css.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/debian/patches/d-bootstrap-use-local-css.patch b/debian/patches/d-bootstrap-use-local-css.patch
deleted file mode 100644
index 33d05603b..000000000
--- a/debian/patches/d-bootstrap-use-local-css.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:39 +0200
-Subject: d-bootstrap-use-local-css
-
-===================================================================
----
- src/bootstrap/src/core/build_steps/doc.rs | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-Index: rust/src/bootstrap/src/core/build_steps/doc.rs
-===================================================================
---- rust.orig/src/bootstrap/src/core/build_steps/doc.rs
-+++ rust/src/bootstrap/src/core/build_steps/doc.rs
-@@ -362,7 +362,27 @@ impl Step for Standalone {
- .arg("--index-page")
- .arg(&builder.src.join("src/doc/index.md"))
- .arg("--markdown-playground-url")
-- .arg("https://play.rust-lang.org/")
-+ .arg("https://play.rust-lang.org/");
-+
-+ // Debian: librustdoc now generates a resource-suffix for static
-+ // files with rustc_hash::FxHasher, so we need to find it.
-+ let _dir = out.join("static.files");
-+ if _dir.is_dir() {
-+ let _css = _dir.read_dir().expect("Debian: failed to read static.files/ when is_dir() == true")
-+ .find_map(|entry| entry.ok().map(|entry| {
-+ let name = entry.file_name().into_string()
-+ .expect("Debian: rustc files should have UTF-8 name");
-+ if name.starts_with("rustdoc-") && name.ends_with(".css") {
-+ Some(name)
-+ } else { None }
-+ })).flatten();
-+ if let Some(name) = _css {
-+ cmd.arg("--markdown-css").arg(name);
-+ }
-+ }
-+
-+ cmd.arg("--markdown-css")
-+ .arg("rust.css")
- .arg("-o")
- .arg(&out)
- .arg(&path);
-@@ -371,11 +391,6 @@ impl Step for Standalone {
- cmd.arg("--disable-minification");
- }
-
-- if filename == "not_found.md" {
-- cmd.arg("--markdown-css").arg("https://doc.rust-lang.org/rust.css");
-- } else {
-- cmd.arg("--markdown-css").arg("rust.css");
-- }
- builder.run(&mut cmd);
- }
-