Rename patches

This commit is contained in:
Ximin Luo 2017-01-04 16:01:48 +01:00
parent 38b66c3c89
commit 8ab363c7a7
21 changed files with 16 additions and 38 deletions

33
debian/patches/series vendored
View File

@ -1,17 +1,16 @@
rust-gdb-paths
rust-lldb-paths
add-soname
dont-download-stage0.diff
reproducible-dl-stage0.patch
fix-configure-for-deb-arches.patch
ignore-failing-armhf-tests_02.patch
ignore-failing-armhf-tests_03.patch
dynamic-link-llvm.patch
ignore-stdcall-test-on-arm64.patch
ignore-test-failing-i386.diff
ignore-test-failing-arm64.diff
#use-system-jquery-symlink.patch
use-system-jquery.patch
detect-mips-cpu.patch
fill-in-mips-mk-rules.patch
jemalloc-disable-tests.patch
d-rust-gdb-paths
d-rust-lldb-paths
d-add-soname.patch
d-dont-download-stage0.patch
u-reproducible-dl-stage0.patch
d-fix-configure-for-deb-arches.patch
u-ignore-failing-armhf-tests_02.patch
u-ignore-failing-armhf-tests_03.patch
d-dynamic-link-llvm.patch
u-ignore-stdcall-test-on-arm64.patch
u-ignore-test-failing-i386.patch
u-ignore-test-failing-arm64.patch
d-use-system-jquery.patch
u-detect-mips-cpu.patch
d-fill-in-mips-mk-rules.patch
u-jemalloc-disable-tests.patch

View File

@ -1,21 +0,0 @@
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -655,8 +655,16 @@
// Add all the static files. These may already exist, but we just
// overwrite them anyway to make sure that they're fresh and up-to-date.
- write(cx.dst.join("jquery.js"),
- include_bytes!("static/jquery-2.1.4.min.js"))?;
+ {
+ // In Debian, just link to the system jquery instead
+ let jquery_system_path = "/usr/share/javascript/jquery/jquery.min.js";
+ let jquery = cx.dst.join("jquery.js");
+ let jquery = jquery.as_path();
+ if jquery.symlink_metadata().is_ok() { // exists() returns false for broken symlinks but we also need to rm those
+ try_err!(fs::remove_file(jquery), &jquery);
+ }
+ try_err!(::std::os::unix::fs::symlink(jquery_system_path, jquery), &jquery);
+ }
write(cx.dst.join("main.js"),
include_bytes!("static/main.js"))?;
write(cx.dst.join("playpen.js"),