summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--editors/lapce/Makefile4
-rw-r--r--editors/lapce/Makefile.crates11
-rw-r--r--editors/lapce/distinfo28
-rw-r--r--editors/lapce/files/patch-Cargo.lock6
-rw-r--r--editors/lapce/files/patch-cargo-crates_fontdb-0.23.0_src_lib.rs23
5 files changed, 46 insertions, 26 deletions
diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index 92fda6499227..0b19128cec57 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,7 +1,6 @@
PORTNAME= lapce
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.4 # Cargo.lock patched: `make patch cargo-crates`
-PORTREVISION= 1
+DISTVERSION= 0.4.5 # Cargo.lock patched: `make patch cargo-crates`
CATEGORIES= editors
MAINTAINER= eduardo@FreeBSD.org
@@ -44,5 +43,6 @@ post-install:
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cargo-crates/fontdb-0.16.2/src/lib.rs
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cargo-crates/fontdb-0.23.0/src/lib.rs
.include <bsd.port.mk>
diff --git a/editors/lapce/Makefile.crates b/editors/lapce/Makefile.crates
index f8f9fc59b1ad..93a43dde5e32 100644
--- a/editors/lapce/Makefile.crates
+++ b/editors/lapce/Makefile.crates
@@ -133,7 +133,6 @@ CARGO_CRATES= Inflector-0.11.4 \
dirs-sys-0.3.7 \
dirs-sys-next-0.1.2 \
dispatch-0.2.0 \
- dispatch2-0.2.0 \
dispatch2-0.3.0 \
displaydoc-0.2.5 \
dlib-0.5.2 \
@@ -429,7 +428,7 @@ CARGO_CRATES= Inflector-0.11.4 \
renderdoc-sys-1.1.0 \
reqwest-0.11.27 \
resvg-0.45.1 \
- rfd-0.15.3 \
+ rfd-0.15.4 \
rgb-0.8.36 \
roxmltree-0.19.0 \
roxmltree-0.20.0 \
@@ -489,9 +488,9 @@ CARGO_CRATES= Inflector-0.11.4 \
strict-num-0.1.1 \
strsim-0.10.0 \
strum-0.26.3 \
- strum-0.27.1 \
+ strum-0.27.2 \
strum_macros-0.26.4 \
- strum_macros-0.27.1 \
+ strum_macros-0.27.2 \
svgtypes-0.15.3 \
swash-0.2.5 \
syn-1.0.109 \
@@ -630,7 +629,7 @@ CARGO_CRATES= Inflector-0.11.4 \
wiggle-macro-14.0.2 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
- winapi-util-0.1.5 \
+ winapi-util-0.1.10 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
winch-codegen-0.12.2 \
windows-0.44.0 \
@@ -723,12 +722,12 @@ CARGO_CRATES= Inflector-0.11.4 \
zvariant_utils-3.2.0 \
structdesc@git+https://github.com/lapce/structdesc?rev=bb56969f22fdb2c2d6c03f158fd4a2bdc983b659\#bb56969f22fdb2c2d6c03f158fd4a2bdc983b659 \
psp-types@git+https://github.com/lapce/psp-types?rev=f7fea28f59e7b2d6faa1034a21679ad49b3524ad\#f7fea28f59e7b2d6faa1034a21679ad49b3524ad \
- floem,floem-editor-core,floem_reactive,floem_renderer,floem_tiny_skia_renderer,floem_vger_renderer@git+https://github.com/lapce/floem?rev=abe59206013a3d700d861ccff3439d94ad3e2c45\#abe59206013a3d700d861ccff3439d94ad3e2c45 \
alacritty_terminal@git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f\#cacdb5bb3b72bad2c729227537979d95af75978f \
wasi-experimental-http-wasmtime@git+https://github.com/lapce/wasi-experimental-http\#21419eb785cb583ead180f25a9685fa16de7f326 \
human-sort@git+https://github.com/dragazo/human-sort?rev=1e74db1e09e8194ba88ad983723cf6f8b0c365da\#1e74db1e09e8194ba88ad983723cf6f8b0c365da \
floem-vger@git+https://github.com/lapce/vger-rs.git?rev=3206d47ec1e30b645ddcb0687036ba3e1f0d98ec\#3206d47ec1e30b645ddcb0687036ba3e1f0d98ec \
dpi,winit@git+https://github.com/rust-windowing/winit?rev=ee245c569d65fdeacf705ee5eedb564508d10ebe\#ee245c569d65fdeacf705ee5eedb564508d10ebe \
+ floem,floem-editor-core,floem_reactive,floem_renderer,floem_tiny_skia_renderer,floem_vger_renderer@git+https://github.com/lapce/floem?rev=e0dd862564e3afbad5cba8ebe60df166a7a41e56\#e0dd862564e3afbad5cba8ebe60df166a7a41e56 \
muda@git+https://github.com/tauri-apps/muda?rev=8e986af3cea96a729413abc75c3702dec3990bd2\#8e986af3cea96a729413abc75c3702dec3990bd2 \
tracing,tracing-appender,tracing-attributes,tracing-core,tracing-log,tracing-subscriber@git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704\#908cc432a5994f6e17c8f36e13c217dc40085704 \
regalloc2@git+https://github.com/bytecodealliance/regalloc2?rev=5d79e12d0a93b10fc181f4da409b4671dd365228\#5d79e12d0a93b10fc181f4da409b4671dd365228 \
diff --git a/editors/lapce/distinfo b/editors/lapce/distinfo
index d3f132b2b267..d6c6da39c26c 100644
--- a/editors/lapce/distinfo
+++ b/editors/lapce/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1756581753
+TIMESTAMP = 1757153410
SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3
SIZE (rust/crates/Inflector-0.11.4.crate) = 17438
SHA256 (rust/crates/ab_glyph-0.2.21.crate) = 5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39
@@ -269,8 +269,6 @@ SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6f
SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
SHA256 (rust/crates/dispatch-0.2.0.crate) = bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b
SIZE (rust/crates/dispatch-0.2.0.crate) = 10229
-SHA256 (rust/crates/dispatch2-0.2.0.crate) = 1a0d569e003ff27784e0e14e4a594048698e0c0f0b66cabcb51511be55a7caa0
-SIZE (rust/crates/dispatch2-0.2.0.crate) = 38637
SHA256 (rust/crates/dispatch2-0.3.0.crate) = 89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec
SIZE (rust/crates/dispatch2-0.3.0.crate) = 54606
SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
@@ -861,8 +859,8 @@ SHA256 (rust/crates/reqwest-0.11.27.crate) = dd67538700a17451e7cba03ac727fb961ab
SIZE (rust/crates/reqwest-0.11.27.crate) = 163155
SHA256 (rust/crates/resvg-0.45.1.crate) = a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43
SIZE (rust/crates/resvg-0.45.1.crate) = 78002
-SHA256 (rust/crates/rfd-0.15.3.crate) = 80c844748fdc82aae252ee4594a89b6e7ebef1063de7951545564cbc4e57075d
-SIZE (rust/crates/rfd-0.15.3.crate) = 54977
+SHA256 (rust/crates/rfd-0.15.4.crate) = ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed
+SIZE (rust/crates/rfd-0.15.4.crate) = 56785
SHA256 (rust/crates/rgb-0.8.36.crate) = 20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59
SIZE (rust/crates/rgb-0.8.36.crate) = 16576
SHA256 (rust/crates/roxmltree-0.19.0.crate) = 3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f
@@ -981,12 +979,12 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0
SIZE (rust/crates/strsim-0.10.0.crate) = 11355
SHA256 (rust/crates/strum-0.26.3.crate) = 8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06
SIZE (rust/crates/strum-0.26.3.crate) = 7237
-SHA256 (rust/crates/strum-0.27.1.crate) = f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32
-SIZE (rust/crates/strum-0.27.1.crate) = 7467
+SHA256 (rust/crates/strum-0.27.2.crate) = af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf
+SIZE (rust/crates/strum-0.27.2.crate) = 8489
SHA256 (rust/crates/strum_macros-0.26.4.crate) = 4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be
SIZE (rust/crates/strum_macros-0.26.4.crate) = 27531
-SHA256 (rust/crates/strum_macros-0.27.1.crate) = c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8
-SIZE (rust/crates/strum_macros-0.27.1.crate) = 29670
+SHA256 (rust/crates/strum_macros-0.27.2.crate) = 7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7
+SIZE (rust/crates/strum_macros-0.27.2.crate) = 30522
SHA256 (rust/crates/svgtypes-0.15.3.crate) = 68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc
SIZE (rust/crates/svgtypes-0.15.3.crate) = 43696
SHA256 (rust/crates/swash-0.2.5.crate) = f745de914febc7c9ab4388dfaf94bbc87e69f57bb41133a9b0c84d4be49856f3
@@ -1263,8 +1261,8 @@ SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe9399
SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
-SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-util-0.1.10.crate) = 0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22
+SIZE (rust/crates/winapi-util-0.1.10.crate) = 13370
SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
SHA256 (rust/crates/winch-codegen-0.12.2.crate) = d2942fc0530ed88259df32f09f52a4222583e1ec7c3fa3f4a911905bbf70c3b0
@@ -1449,8 +1447,6 @@ SHA256 (lapce-structdesc-bb56969f22fdb2c2d6c03f158fd4a2bdc983b659_GH0.tar.gz) =
SIZE (lapce-structdesc-bb56969f22fdb2c2d6c03f158fd4a2bdc983b659_GH0.tar.gz) = 2312
SHA256 (lapce-psp-types-f7fea28f59e7b2d6faa1034a21679ad49b3524ad_GH0.tar.gz) = ce4e9df73ce961e3b6058b00f8f4588890055325da88ed580201b0306f2c5ec5
SIZE (lapce-psp-types-f7fea28f59e7b2d6faa1034a21679ad49b3524ad_GH0.tar.gz) = 1262
-SHA256 (lapce-floem-abe59206013a3d700d861ccff3439d94ad3e2c45_GH0.tar.gz) = 9f60e7a8e0286c9c0a5d9d720ce8e39dc5e24f534f9e8c424703066a5a86c49c
-SIZE (lapce-floem-abe59206013a3d700d861ccff3439d94ad3e2c45_GH0.tar.gz) = 2674680
SHA256 (alacritty-alacritty-cacdb5bb3b72bad2c729227537979d95af75978f_GH0.tar.gz) = 0dcf60782756becf851c189b6dadd409fc896fce829920f07eaef569887d02ee
SIZE (alacritty-alacritty-cacdb5bb3b72bad2c729227537979d95af75978f_GH0.tar.gz) = 1639729
SHA256 (lapce-wasi-experimental-http-21419eb785cb583ead180f25a9685fa16de7f326_GH0.tar.gz) = ace4fd9e640f47bcf61f635776deb5de5d2c98d9566edbe3662da51d30c796dc
@@ -1461,6 +1457,8 @@ SHA256 (lapce-vger-rs-3206d47ec1e30b645ddcb0687036ba3e1f0d98ec_GH0.tar.gz) = 98c
SIZE (lapce-vger-rs-3206d47ec1e30b645ddcb0687036ba3e1f0d98ec_GH0.tar.gz) = 100450
SHA256 (rust-windowing-winit-ee245c569d65fdeacf705ee5eedb564508d10ebe_GH0.tar.gz) = 6ff81ea0500730b1655efd8d1ed7849f7d3b0e9053960f7df32fbd68d5a510b5
SIZE (rust-windowing-winit-ee245c569d65fdeacf705ee5eedb564508d10ebe_GH0.tar.gz) = 626178
+SHA256 (lapce-floem-e0dd862564e3afbad5cba8ebe60df166a7a41e56_GH0.tar.gz) = 530cc6b926c4ad032fd05a0414ac2bf9b27d289a0beee9c83302bed728945743
+SIZE (lapce-floem-e0dd862564e3afbad5cba8ebe60df166a7a41e56_GH0.tar.gz) = 2674839
SHA256 (tauri-apps-muda-8e986af3cea96a729413abc75c3702dec3990bd2_GH0.tar.gz) = 27b8eee39b68ca69e4c152e550caddf6a5740329d4dc285c7470d0cad13100e7
SIZE (tauri-apps-muda-8e986af3cea96a729413abc75c3702dec3990bd2_GH0.tar.gz) = 105561
SHA256 (tokio-rs-tracing-908cc432a5994f6e17c8f36e13c217dc40085704_GH0.tar.gz) = 810e957c463717e22ff4bc93e168a45c4f85e5552015d1c15d6b223ba92d4b03
@@ -1471,5 +1469,5 @@ SHA256 (lapce-lsp-types-feaa1e2ec80975c9dadd400a238ceacf071058e6_GH0.tar.gz) = 3
SIZE (lapce-lsp-types-feaa1e2ec80975c9dadd400a238ceacf071058e6_GH0.tar.gz) = 68504
SHA256 (lapce-locale_config-54c9fe6a247c3618c224ec57e6c3a747bc3a96e4_GH0.tar.gz) = 662e0079b9b2a666b47c8ee953c17f79c810a437ba7c9e4c5d60f924d4ace4ac
SIZE (lapce-locale_config-54c9fe6a247c3618c224ec57e6c3a747bc3a96e4_GH0.tar.gz) = 22177
-SHA256 (lapce-lapce-v0.4.4_GH0.tar.gz) = f1acfc01a1d9ac22cde0e2e8105de048fa6940d3f68b23b8b26438028109987a
-SIZE (lapce-lapce-v0.4.4_GH0.tar.gz) = 2676079
+SHA256 (lapce-lapce-v0.4.5_GH0.tar.gz) = e5e9df702c2f108da57b8a5232d797c582171c0523a0ac381947058ec667423c
+SIZE (lapce-lapce-v0.4.5_GH0.tar.gz) = 2868458
diff --git a/editors/lapce/files/patch-Cargo.lock b/editors/lapce/files/patch-Cargo.lock
index 5855975e4a8d..b1b62609844d 100644
--- a/editors/lapce/files/patch-Cargo.lock
+++ b/editors/lapce/files/patch-Cargo.lock
@@ -1,6 +1,6 @@
---- Cargo.lock.orig 2025-08-30 05:01:02 UTC
+--- Cargo.lock.orig 2025-09-05 16:15:14 UTC
+++ Cargo.lock
-@@ -4010,15 +4010,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"
-@@ -4026,7 +4017,6 @@ dependencies = [
+@@ -4019,7 +4010,6 @@ dependencies = [
dependencies = [
"cc",
"libc",
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 {
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 21:22:06 +0000