diff options
Diffstat (limited to 'debian/patches/d-0002-mdbook-strip-embedded-libs.patch')
| -rw-r--r-- | debian/patches/d-0002-mdbook-strip-embedded-libs.patch | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index 81a0e2792..662b139ae 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -13,10 +13,10 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase vendor/mdbook/src/theme/searcher/mod.rs | 2 - 7 files changed, 47 insertions(+), 240 deletions(-) -diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs -index 4170c32..d7dcda7 100644 ---- a/src/tools/linkchecker/main.rs -+++ b/src/tools/linkchecker/main.rs +Index: rust/src/tools/linkchecker/main.rs +=================================================================== +--- rust.orig/src/tools/linkchecker/main.rs ++++ rust/src/tools/linkchecker/main.rs @@ -159,7 +159,17 @@ impl Checker { for entry in t!(dir.read_dir()).map(|e| t!(e)) { let path = entry.path(); @@ -66,10 +66,10 @@ index 4170c32..d7dcda7 100644 if is_exception(file, &target_pretty_path) { report.links_ignored_exception += 1; } else { -diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs -index ebcdd93..41dab42 100644 ---- a/vendor/mdbook/src/book/init.rs -+++ b/vendor/mdbook/src/book/init.rs +Index: rust/vendor/mdbook/src/book/init.rs +=================================================================== +--- rust.orig/vendor/mdbook/src/book/init.rs ++++ rust/vendor/mdbook/src/book/init.rs @@ -153,25 +153,6 @@ impl BookBuilder { let mut js = File::create(themedir.join("book.js"))?; js.write_all(theme::JS)?; @@ -96,11 +96,11 @@ index ebcdd93..41dab42 100644 Ok(()) } -diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -index e170e2f..caa2eff 100644 ---- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -+++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs -@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition}; +Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +=================================================================== +--- rust.orig/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs ++++ rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs +@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, use crate::errors::*; use crate::renderer::html_handlebars::helpers; use crate::renderer::{RenderContext, Renderer}; @@ -129,7 +129,10 @@ index e170e2f..caa2eff 100644 - destination, - "FontAwesome/css/font-awesome.css", - theme::FONT_AWESOME, -- )?; ++ symlink( ++ "/usr/share/fonts-font-awesome/css/font-awesome.min.css", ++ destination.join("css/font-awesome.min.css"), + )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.eot", @@ -140,41 +143,38 @@ index e170e2f..caa2eff 100644 - "FontAwesome/fonts/fontawesome-webfont.svg", - theme::FONT_AWESOME_SVG, + symlink( -+ "/usr/share/fonts-font-awesome/css/font-awesome.min.css", -+ destination.join("css/font-awesome.min.css"), ++ "/usr/share/fonts-font-awesome/fonts", ++ destination.join("fonts"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.ttf", - theme::FONT_AWESOME_TTF, + symlink( -+ "/usr/share/fonts-font-awesome/fonts", -+ destination.join("fonts"), ++ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css", ++ destination.join("highlight.css"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff", - theme::FONT_AWESOME_WOFF, + symlink( -+ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css", -+ destination.join("highlight.css"), ++ "/usr/share/javascript/highlight.js/highlight.js", ++ destination.join("highlight.js"), )?; - write_file( - destination, - "FontAwesome/fonts/fontawesome-webfont.woff2", - theme::FONT_AWESOME_WOFF2, + symlink( -+ "/usr/share/javascript/highlight.js/highlight.js", -+ destination.join("highlight.js"), ++ "/usr/share/javascript/mathjax/MathJax.js", ++ destination.join("MathJax.js"), )?; - write_file( - destination, - "FontAwesome/fonts/FontAwesome.ttf", - theme::FONT_AWESOME_TTF, -+ symlink( -+ "/usr/share/javascript/mathjax/MathJax.js", -+ destination.join("MathJax.js"), - )?; +- )?; - if html_config.copy_fonts { - write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?; - for (file_name, contents) in theme::fonts::LICENSES.iter() { @@ -237,11 +237,11 @@ index e170e2f..caa2eff 100644 Ok(()) } -diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs -index a9e2f5c..3e3f69c 100644 ---- a/vendor/mdbook/src/renderer/html_handlebars/search.rs -+++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs -@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) -> +Index: rust/vendor/mdbook/src/renderer/html_handlebars/search.rs +=================================================================== +--- rust.orig/vendor/mdbook/src/renderer/html_handlebars/search.rs ++++ rust/vendor/mdbook/src/renderer/html_handlebars/search.rs +@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Sear format!("Object.assign(window.search, {});", index).as_bytes(), )?; utils::fs::write_file(destination, "searcher.js", searcher::JS)?; @@ -250,10 +250,10 @@ index a9e2f5c..3e3f69c 100644 debug!("Copying search files ✓"); } -diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs -index 6f3948c..7e5c54c 100644 ---- a/vendor/mdbook/src/theme/index.hbs -+++ b/vendor/mdbook/src/theme/index.hbs +Index: rust/vendor/mdbook/src/theme/index.hbs +=================================================================== +--- rust.orig/vendor/mdbook/src/theme/index.hbs ++++ rust/vendor/mdbook/src/theme/index.hbs @@ -33,10 +33,7 @@ {{/if}} @@ -381,10 +381,10 @@ index 6f3948c..7e5c54c 100644 <!-- Custom JS scripts --> {{#each additional_js}} -diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs -index 6e6b509..ef8886b 100644 ---- a/vendor/mdbook/src/theme/mod.rs -+++ b/vendor/mdbook/src/theme/mod.rs +Index: rust/vendor/mdbook/src/theme/mod.rs +=================================================================== +--- rust.orig/vendor/mdbook/src/theme/mod.rs ++++ rust/vendor/mdbook/src/theme/mod.rs @@ -1,9 +1,5 @@ #![allow(missing_docs)] @@ -395,7 +395,7 @@ index 6e6b509..ef8886b 100644 #[cfg(feature = "search")] pub mod searcher; -@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css"); +@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = includ pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png"); pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg"); pub static JS: &[u8] = include_bytes!("book.js"); @@ -461,10 +461,10 @@ index 6e6b509..ef8886b 100644 }; assert_eq!(got, empty); -diff --git a/vendor/mdbook/src/theme/searcher/mod.rs b/vendor/mdbook/src/theme/searcher/mod.rs -index d5029db..59eda8a 100644 ---- a/vendor/mdbook/src/theme/searcher/mod.rs -+++ b/vendor/mdbook/src/theme/searcher/mod.rs +Index: rust/vendor/mdbook/src/theme/searcher/mod.rs +=================================================================== +--- rust.orig/vendor/mdbook/src/theme/searcher/mod.rs ++++ rust/vendor/mdbook/src/theme/searcher/mod.rs @@ -2,5 +2,3 @@ //! the "search" cargo feature is disabled. |