3 files changed, 31 insertions, 9 deletions
diff --git a/editors/lapce/files/patch-Cargo.lock b/editors/lapce/files/patch-Cargo.lock
index 299b7ce77f72..b1b62609844d 100644
--- a/editors/lapce/files/patch-Cargo.lock
+++ b/editors/lapce/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig	2025-06-26 20:06:31 UTC
+--- Cargo.lock.orig	2025-09-05 16:15:14 UTC
 +++ Cargo.lock
-@@ -4023,15 +4023,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178
+@@ -4003,15 +4003,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178
  checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
  
  [[package]]
@@ -16,7 +16,7 @@
  name = "openssl-sys"
  version = "0.9.106"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -4039,7 +4030,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 1175c0ea4c21..084a43e0c977 100644
--- a/editors/lapce/files/patch-Cargo.toml
+++ b/editors/lapce/files/patch-Cargo.toml
@@ -5,9 +5,8 @@ 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	2025-06-26 20:06:31 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" }
@@ -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_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 {