git: 0ea6787bcd24 - main - editors/lapce: Update to latest commit 0.4.0-24
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 May 2024 19:20:51 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0ea6787bcd24e99812ecbc04c8c38c9eb0f5e812
commit 0ea6787bcd24e99812ecbc04c8c38c9eb0f5e812
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-05-22 08:17:32 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-05-23 19:20:36 +0000
editors/lapce: Update to latest commit 0.4.0-24
Delete floem patch as support for FreeBSD was merged upstream.
ChangeLog:
https://github.com/lapce/lapce/compare/0.4.0-16-g985b07c..0.4.0-24-g9d016feb
---
editors/lapce/Makefile | 5 +-
editors/lapce/Makefile.crates | 8 ++--
editors/lapce/distinfo | 22 ++++-----
editors/lapce/files/patch-floem | 100 ----------------------------------------
4 files changed, 17 insertions(+), 118 deletions(-)
diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index a329a39f048d..0a476476dbf8 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,8 +1,7 @@
PORTNAME= lapce
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.0-16 # Cargo.lock patched: `make patch cargo-crates`
-DISTVERSIONSUFFIX= -g985b07c
-PORTREVISION= 2
+DISTVERSION= 0.4.0-24 # Cargo.lock patched: `make patch cargo-crates`
+DISTVERSIONSUFFIX= -g9d016feb
CATEGORIES= editors
MAINTAINER= eduardo@FreeBSD.org
diff --git a/editors/lapce/Makefile.crates b/editors/lapce/Makefile.crates
index 69e467d6e1dc..dfabf7dc398c 100644
--- a/editors/lapce/Makefile.crates
+++ b/editors/lapce/Makefile.crates
@@ -57,7 +57,7 @@ CARGO_CRATES= Inflector-0.11.4 \
bstr-1.7.0 \
bumpalo-3.14.0 \
bytecount-0.6.3 \
- bytemuck-1.14.3 \
+ bytemuck-1.15.0 \
bytemuck_derive-1.5.0 \
byteorder-1.4.3 \
bytes-1.5.0 \
@@ -377,7 +377,7 @@ CARGO_CRATES= Inflector-0.11.4 \
proc-macro2-diagnostics-0.10.1 \
profiling-1.0.10 \
psm-0.1.21 \
- pulldown-cmark-0.10.2 \
+ pulldown-cmark-0.10.3 \
pulldown-cmark-escape-0.10.0 \
quick-xml-0.31.0 \
quote-1.0.35 \
@@ -529,7 +529,7 @@ CARGO_CRATES= Inflector-0.11.4 \
unicode-script-0.5.5 \
unicode-segmentation-1.10.0 \
unicode-vo-0.1.0 \
- unicode-width-0.1.11 \
+ unicode-width-0.1.12 \
unicode-xid-0.2.4 \
url-2.5.0 \
urlencoding-2.1.3 \
@@ -677,9 +677,9 @@ CARGO_CRATES= Inflector-0.11.4 \
tree-sitter-md@git+https://github.com/MDeiml/tree-sitter-markdown.git?rev=272e080bca0efd19a06a7f4252d746417224959e\#272e080bca0efd19a06a7f4252d746417224959e \
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,floem-editor-core,floem_reactive,floem_renderer,floem_tiny_skia_renderer,floem_vger_renderer@git+https://github.com/lapce/floem?rev=8f5a9c5c2bee1bb0355c7a058b6e39be42878534\#8f5a9c5c2bee1bb0355c7a058b6e39be42878534 \
structdesc@git+https://github.com/lapce/structdesc\#47d8201fb13240166f4d842c718d63c1e24f0236 \
tracing,tracing-appender,tracing-attributes,tracing-core,tracing-log,tracing-subscriber@git+https://github.com/tokio-rs/tracing?rev=908cc432a5994f6e17c8f36e13c217dc40085704\#908cc432a5994f6e17c8f36e13c217dc40085704 \
+ floem,floem-editor-core,floem_reactive,floem_renderer,floem_tiny_skia_renderer,floem_vger_renderer@git+https://github.com/lapce/floem?rev=c9e3d6a131c63286dc634b27c38b95bde43ed90d\#c9e3d6a131c63286dc634b27c38b95bde43ed90d \
tree-sitter-bash@git+https://github.com/tree-sitter/tree-sitter-bash?rev=4488aa41406547e478636a4fcfd24f5bbc3f2f74\#4488aa41406547e478636a4fcfd24f5bbc3f2f74 \
regalloc2@git+https://github.com/bytecodealliance/regalloc2?rev=5d79e12d0a93b10fc181f4da409b4671dd365228\#5d79e12d0a93b10fc181f4da409b4671dd365228 \
lsp-types@git+https://github.com/lapce/lsp-types?rev=feaa1e2ec80975c9dadd400a238ceacf071058e6\#feaa1e2ec80975c9dadd400a238ceacf071058e6
diff --git a/editors/lapce/distinfo b/editors/lapce/distinfo
index ba5cc2d26fe7..18b41fafc311 100644
--- a/editors/lapce/distinfo
+++ b/editors/lapce/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1715629174
+TIMESTAMP = 1716361908
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
@@ -117,8 +117,8 @@ SHA256 (rust/crates/bumpalo-3.14.0.crate) = 7f30e7476521f6f8af1a1c4c0b8cc94f0bee
SIZE (rust/crates/bumpalo-3.14.0.crate) = 82400
SHA256 (rust/crates/bytecount-0.6.3.crate) = 2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c
SIZE (rust/crates/bytecount-0.6.3.crate) = 12416
-SHA256 (rust/crates/bytemuck-1.14.3.crate) = a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f
-SIZE (rust/crates/bytemuck-1.14.3.crate) = 47032
+SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
+SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
SHA256 (rust/crates/bytemuck_derive-1.5.0.crate) = 965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1
SIZE (rust/crates/bytemuck_derive-1.5.0.crate) = 17323
SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
@@ -757,8 +757,8 @@ SHA256 (rust/crates/profiling-1.0.10.crate) = 45f10e75d83c7aec79a6aa46f897075890
SIZE (rust/crates/profiling-1.0.10.crate) = 31168
SHA256 (rust/crates/psm-0.1.21.crate) = 5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874
SIZE (rust/crates/psm-0.1.21.crate) = 23126
-SHA256 (rust/crates/pulldown-cmark-0.10.2.crate) = 5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c
-SIZE (rust/crates/pulldown-cmark-0.10.2.crate) = 141610
+SHA256 (rust/crates/pulldown-cmark-0.10.3.crate) = 76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993
+SIZE (rust/crates/pulldown-cmark-0.10.3.crate) = 141746
SHA256 (rust/crates/pulldown-cmark-escape-0.10.0.crate) = d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b
SIZE (rust/crates/pulldown-cmark-escape-0.10.0.crate) = 8944
SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
@@ -1061,8 +1061,8 @@ SHA256 (rust/crates/unicode-segmentation-1.10.0.crate) = 0fdbf052a0783de01e944a6
SIZE (rust/crates/unicode-segmentation-1.10.0.crate) = 93893
SHA256 (rust/crates/unicode-vo-0.1.0.crate) = b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94
SIZE (rust/crates/unicode-vo-0.1.0.crate) = 8084
-SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
-SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode-width-0.1.12.crate) = 68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6
+SIZE (rust/crates/unicode-width-0.1.12.crate) = 24062
SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
@@ -1357,17 +1357,17 @@ SHA256 (lapce-wasi-experimental-http-21419eb785cb583ead180f25a9685fa16de7f326_GH
SIZE (lapce-wasi-experimental-http-21419eb785cb583ead180f25a9685fa16de7f326_GH0.tar.gz) = 26098
SHA256 (dragazo-human-sort-1e74db1e09e8194ba88ad983723cf6f8b0c365da_GH0.tar.gz) = 32fc6c98cd09e23087aca3ac3d0714f634472ca25c1c1bbec62937a227060cb2
SIZE (dragazo-human-sort-1e74db1e09e8194ba88ad983723cf6f8b0c365da_GH0.tar.gz) = 3859
-SHA256 (lapce-floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534_GH0.tar.gz) = 07bf49849a93d5f86fef5a90ed43e2658a41d2895d9d7ab6ccb517231309126e
-SIZE (lapce-floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534_GH0.tar.gz) = 486852
SHA256 (lapce-structdesc-47d8201fb13240166f4d842c718d63c1e24f0236_GH0.tar.gz) = 9bc99ce807bb484353ed48e5825916009878689bb45762dfedef444f8f729690
SIZE (lapce-structdesc-47d8201fb13240166f4d842c718d63c1e24f0236_GH0.tar.gz) = 2305
SHA256 (tokio-rs-tracing-908cc432a5994f6e17c8f36e13c217dc40085704_GH0.tar.gz) = 810e957c463717e22ff4bc93e168a45c4f85e5552015d1c15d6b223ba92d4b03
SIZE (tokio-rs-tracing-908cc432a5994f6e17c8f36e13c217dc40085704_GH0.tar.gz) = 541394
+SHA256 (lapce-floem-c9e3d6a131c63286dc634b27c38b95bde43ed90d_GH0.tar.gz) = 69299ad78cec98454b907efabf5312042134c95e39edd3bed2a2f660c4855ec8
+SIZE (lapce-floem-c9e3d6a131c63286dc634b27c38b95bde43ed90d_GH0.tar.gz) = 488004
SHA256 (tree-sitter-tree-sitter-bash-4488aa41406547e478636a4fcfd24f5bbc3f2f74_GH0.tar.gz) = e889ee51fad864b94015e939220d670727991b77e75008940e5b2a9886d8cc01
SIZE (tree-sitter-tree-sitter-bash-4488aa41406547e478636a4fcfd24f5bbc3f2f74_GH0.tar.gz) = 204396
SHA256 (bytecodealliance-regalloc2-5d79e12d0a93b10fc181f4da409b4671dd365228_GH0.tar.gz) = fe937c98e9ff8022b11c817eadba78cfc38911063ae5a7342a74761bdb092d62
SIZE (bytecodealliance-regalloc2-5d79e12d0a93b10fc181f4da409b4671dd365228_GH0.tar.gz) = 127582
SHA256 (lapce-lsp-types-feaa1e2ec80975c9dadd400a238ceacf071058e6_GH0.tar.gz) = 3d549bbbe81d6160cf188505b0320b2eff3dd3550a46d3ee2d3499ec89a6dfc8
SIZE (lapce-lsp-types-feaa1e2ec80975c9dadd400a238ceacf071058e6_GH0.tar.gz) = 68504
-SHA256 (lapce-lapce-v0.4.0-16-g985b07c_GH0.tar.gz) = 30fb1ce7c310eb6f42b19c85626376606483d68d3b77cb94897fc85fe4ce636a
-SIZE (lapce-lapce-v0.4.0-16-g985b07c_GH0.tar.gz) = 2073639
+SHA256 (lapce-lapce-v0.4.0-24-g9d016feb_GH0.tar.gz) = 12317f3f5366f25270b18fc8ca709e047d5e9ef8dc2b612f6d149c747cf5b133
+SIZE (lapce-lapce-v0.4.0-24-g9d016feb_GH0.tar.gz) = 2074434
diff --git a/editors/lapce/files/patch-floem b/editors/lapce/files/patch-floem
deleted file mode 100644
index b8771370842f..000000000000
--- a/editors/lapce/files/patch-floem
+++ /dev/null
@@ -1,100 +0,0 @@
-https://github.com/lapce/floem/pull/443
-
---- ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/app_handle.rs.orig 2024-05-13 13:05:01 UTC
-+++ ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/app_handle.rs
-@@ -85,7 +85,7 @@ impl ApplicationHandle {
- }
- }
- }
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- AppUpdateEvent::MenuAction {
- window_id,
- action_id,
---- ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/app.rs.orig 2024-05-13 13:04:56.470939000 +0200
-+++ ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/app.rs 2024-05-13 13:05:40.873460000 +0200
-@@ -64,7 +64,7 @@ pub(crate) enum AppUpdateEvent {
- RequestTimer {
- timer: Timer,
- },
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- MenuAction {
- window_id: WindowId,
- action_id: usize,
---- ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/window_handle.rs.orig 2024-05-13 13:05:07.252707000 +0200
-+++ ../floem-8f5a9c5c2bee1bb0355c7a058b6e39be42878534/src/window_handle.rs 2024-05-13 13:15:25.162556000 +0200
-@@ -17,9 +17,9 @@ use peniko::kurbo::{Affine, Point, Rect, Size, Vec2};
- use image::DynamicImage;
- use peniko::kurbo::{Affine, Point, Rect, Size, Vec2};
-
--#[cfg(target_os = "linux")]
-+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
- use crate::unit::UnitExt;
--#[cfg(target_os = "linux")]
-+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
- use crate::views::{container, stack};
- use crate::{
- animate::{AnimPropKind, AnimUpdateMsg, AnimValue, AnimatedProp, SizeUnit},
-@@ -73,7 +73,7 @@ pub(crate) struct WindowHandle {
- pub(crate) cursor_position: Point,
- pub(crate) window_position: Point,
- pub(crate) last_pointer_down: Option<(u8, Point, Instant)>,
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- pub(crate) context_menu: RwSignal<Option<(Menu, Point)>>,
- }
-
-@@ -96,13 +96,13 @@ impl WindowHandle {
-
- set_current_view(id);
-
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- let context_menu = scope.create_rw_signal(None);
-
-- #[cfg(not(target_os = "linux"))]
-+ #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
- let view = with_scope(scope, move || view_fn(window_id));
-
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- let view = with_scope(scope, move || {
- stack((
- container(view_fn(window_id)).style(|s| s.size(100.pct(), 100.pct())),
-@@ -139,7 +139,7 @@ impl WindowHandle {
- modifiers: Modifiers::default(),
- cursor_position: Point::ZERO,
- window_position: Point::ZERO,
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- context_menu,
- last_pointer_down: None,
- };
-@@ -835,7 +835,7 @@ impl WindowHandle {
- self.show_context_menu(platform_menu, pos);
- #[cfg(target_os = "windows")]
- self.show_context_menu(platform_menu, pos);
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- self.show_context_menu(menu, platform_menu, pos);
- }
- UpdateMessage::WindowMenu { menu } => {
-@@ -1139,7 +1139,7 @@ impl WindowHandle {
- }
- }
-
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- fn show_context_menu(
- &self,
- menu: Menu,
-@@ -1199,7 +1199,7 @@ pub(crate) fn set_current_view(id: ViewId) {
- });
- }
-
--#[cfg(target_os = "linux")]
-+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
- fn context_menu_view(
- cx: Scope,
- window_id: WindowId,