diff options
Diffstat (limited to 'editors/lapce/files')
6 files changed, 36 insertions, 34 deletions
diff --git a/editors/lapce/files/patch-Cargo.lock b/editors/lapce/files/patch-Cargo.lock index 7c50f71f1f18..b1b62609844d 100644 --- a/editors/lapce/files/patch-Cargo.lock +++ b/editors/lapce/files/patch-Cargo.lock @@ -1,6 +1,6 @@ ---- Cargo.lock.orig 2024-06-14 07:52:48 UTC +--- Cargo.lock.orig 2025-09-05 16:15:14 UTC +++ Cargo.lock -@@ -3666,15 +3666,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178 +@@ -4003,15 +4003,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] @@ -14,9 +14,9 @@ - -[[package]] name = "openssl-sys" - version = "0.9.99" + version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3682,7 +3673,6 @@ dependencies = [ +@@ -4019,7 +4010,6 @@ dependencies = [ dependencies = [ "cc", "libc", diff --git a/editors/lapce/files/patch-Cargo.toml b/editors/lapce/files/patch-Cargo.toml index cbf4e449b8af..084a43e0c977 100644 --- a/editors/lapce/files/patch-Cargo.toml +++ b/editors/lapce/files/patch-Cargo.toml @@ -5,16 +5,15 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278837#c3 make extract cp xxx/Cargo.toml xxx/Cargo.toml.1 make configure -diff -dup xxx/Cargo.toml.1 xxx/Cargo.toml ---- Cargo.toml.orig 2024-08-07 22:07:24 UTC +--- Cargo.toml.orig 2025-08-30 05:01:02 UTC +++ Cargo.toml @@ -38,7 +38,7 @@ flate2 = { version = "1.0" } crossbeam-channel = { version = "0.5.12" } directories = { version = "4.0.1" } flate2 = { version = "1.0" } --git2 = { version = "0.19.0", features = ["vendored-openssl"] } -+git2 = { version = "0.19.0" } +-git2 = { version = "0.20.0", features = ["vendored-openssl"] } ++git2 = { version = "0.20.0" } globset = { version = "0.4.14" } hashbrown = { version = "0.14.5", features = ["serde"] } im = { version = "15.0.0", features = ["serde"] } @@ -30,10 +29,10 @@ diff -dup xxx/Cargo.toml.1 xxx/Cargo.toml lsp-types = { version = "0.95.1", features = ["proposed"] } # not following semver, so should be locked to patch version updates only psp-types = { git = "https://github.com/lapce/psp-types", rev = "f7fea28f59e7b2d6faa1034a21679ad49b3524ad" } -@@ -85,31 +90,6 @@ regalloc2 = { rev = "5d79e12d0a93b10fc181f4da409b4671d - # Temporarily patch lsp-types with a version that adds message-type debug - lsp-types = { git = "https://github.com/lapce/lsp-types", rev = "feaa1e2ec80975c9dadd400a238ceacf071058e6" } - regalloc2 = { rev = "5d79e12d0a93b10fc181f4da409b4671dd365228", git = "https://github.com/bytecodealliance/regalloc2" } +@@ -89,31 +94,6 @@ dpi = { git = "https://github.com/rust-windowing/winit + # cargo vendor issue: https://github.com/rust-lang/cargo/issues/10310 + # dpi comes from winit (source) and muda (crate) + dpi = { git = "https://github.com/rust-windowing/winit", rev = "ee245c569d65fdeacf705ee5eedb564508d10ebe" } - - -[workspace.dependencies.tracing] diff --git a/editors/lapce/files/patch-cargo-crates_cosmic-text-0.12.1_src_font_fallback_mod.rs b/editors/lapce/files/patch-cargo-crates_cosmic-text-0.12.1_src_font_fallback_mod.rs deleted file mode 100644 index ee6038aeaceb..000000000000 --- a/editors/lapce/files/patch-cargo-crates_cosmic-text-0.12.1_src_font_fallback_mod.rs +++ /dev/null @@ -1,20 +0,0 @@ ---- cargo-crates/cosmic-text-0.12.1/src/font/fallback/mod.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/cosmic-text-0.12.1/src/font/fallback/mod.rs -@@ -10,7 +10,7 @@ use self::platform::*; - - use self::platform::*; - --#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows",)))] -+#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "freebsd",)))] - #[path = "other.rs"] - mod platform; - -@@ -18,7 +18,7 @@ mod platform; - #[path = "macos.rs"] - mod platform; - --#[cfg(target_os = "linux")] -+#[cfg(any(target_os = "linux", target_os = "freebsd"))] - #[path = "unix.rs"] - mod platform; - diff --git a/editors/lapce/files/patch-cargo-crates_fontdb-0.16.2_src_lib.rs b/editors/lapce/files/patch-cargo-crates_fontdb-0.16.2_src_lib.rs index f912132a9633..966183022469 100644 --- a/editors/lapce/files/patch-cargo-crates_fontdb-0.16.2_src_lib.rs +++ b/editors/lapce/files/patch-cargo-crates_fontdb-0.16.2_src_lib.rs @@ -1,4 +1,4 @@ ---- cargo-crates/fontdb-0.16.2/src/lib.rs.orig 2006-07-24 01:21:28 UTC +--- cargo-crates/fontdb-0.16.2/src/lib.rs.orig 2025-06-28 19:11:51 UTC +++ cargo-crates/fontdb-0.16.2/src/lib.rs @@ -404,7 +404,7 @@ impl Database { #[cfg(not(feature = "fontconfig"))] diff --git a/editors/lapce/files/patch-cargo-crates_fontdb-0.23.0_src_lib.rs b/editors/lapce/files/patch-cargo-crates_fontdb-0.23.0_src_lib.rs new file mode 100644 index 000000000000..523480dda61a --- /dev/null +++ b/editors/lapce/files/patch-cargo-crates_fontdb-0.23.0_src_lib.rs @@ -0,0 +1,23 @@ +--- cargo-crates/fontdb-0.23.0/src/lib.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/fontdb-0.23.0/src/lib.rs +@@ -485,7 +485,7 @@ impl Database { + fn load_no_fontconfig(&mut self) { + let mut seen = Default::default(); + self.load_fonts_dir_impl("/usr/share/fonts/".as_ref(), &mut seen); +- self.load_fonts_dir_impl("/usr/local/share/fonts/".as_ref(), &mut seen); ++ self.load_fonts_dir_impl("%%PREFIX%%/share/fonts/".as_ref(), &mut seen); + + if let Ok(ref home) = std::env::var("HOME") { + let home_path = std::path::Path::new(home); +@@ -527,9 +527,9 @@ impl Database { + }; + + if read_global { +- let _ = fontconfig.merge_config(Path::new("/etc/fonts/local.conf")); ++ let _ = fontconfig.merge_config(Path::new("%%PREFIX%%/etc/fonts/local.conf")); + } +- let _ = fontconfig.merge_config(Path::new("/etc/fonts/fonts.conf")); ++ let _ = fontconfig.merge_config(Path::new("%%PREFIX%%/etc/fonts/fonts.conf")); + } + + for fontconfig_parser::Alias { diff --git a/editors/lapce/files/patch-cargo-crates_slotmap-1.0.7_src_lib.rs b/editors/lapce/files/patch-cargo-crates_slotmap-1.0.7_src_lib.rs index 9e4a91dab6aa..120264a3fe25 100644 --- a/editors/lapce/files/patch-cargo-crates_slotmap-1.0.7_src_lib.rs +++ b/editors/lapce/files/patch-cargo-crates_slotmap-1.0.7_src_lib.rs @@ -1,4 +1,4 @@ ---- cargo-crates/slotmap-1.0.7/src/lib.rs.orig 2024-05-08 07:30:16 UTC +--- cargo-crates/slotmap-1.0.7/src/lib.rs.orig 2025-06-28 19:11:51 UTC +++ cargo-crates/slotmap-1.0.7/src/lib.rs @@ -10,7 +10,7 @@ unused_lifetimes, |