From nobody Tue May 14 07:27:46 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vdnxv0RPwz5KbSl; Tue, 14 May 2024 07:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vdnxt5Ch7z4vn2; Tue, 14 May 2024 07:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715671666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lm3MdqeS4m7XPg2Ca2jnckKK1hUbprSFwOEkY4lEqpc=; b=jsbi4dHOhmPIeAHEgTsyBzzEP6GuXG4PxoPIv7T2i2oTAIS4E2aYXFnJ1+KrFG4TfFJbcm 7j6D0QTJ6YzK0K8OyrzDIiQeVl9cQSg/eckOjoDX0EptwyZ2oeDcBueIpY715tC4D20mpS OlCBndChceIqpVBF/VRzSSH+z3kq1Q48TyEUs7Hmy9HVznBqxzjK0/fgypTsTbwGVJbLN0 j7a+IDhTdw2z7/qHY0jiFVpE2qves450Q18PbMQgTtGDG69Y8Pf6eNsjbvgiXoe85t4oxd p/qRempv7kgCu9wcM1AQ4DqOMY21sUwvb92ldGsGbQ3xS5cqJmnQ2AhGyhIurg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715671666; a=rsa-sha256; cv=none; b=XaItoImbFx6RdtHMP/QpM18IE2Xq3J08RKLY5zfV9tnGds4TQbrp89AVJOmOegDMcVjMML VPYOiIgesdjYPx9RVYmMkPwNxXQ6Tdg8hFFKo2OwKmtzIVcHGkfzVvLgflMnmDNkwK41Yq 8RJCIgh3SiEDBh91mYw7uKRRFXQDrn4k5/uJ5cMe5OIUZdgmGLgIF+FsDaJOjqzCtXsvD8 fjF2aoPhj6aEytgYO+6q4ZxeB7L0RD2YDV67zKvRSXldWd7ZI4YGEjh7nh1FvgmCz1N6uo kmKJoTxk47LAZIHG1FKMDvQJdYsUFXtDoYJLZ9/pWsw0lgd0hUNo0yYK0UTXrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715671666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lm3MdqeS4m7XPg2Ca2jnckKK1hUbprSFwOEkY4lEqpc=; b=P5neA6/4jyvwuYvjPYxi9WP/e5MfwRCzZdYIdlfjvIFINEV/b3n+Nl91zF9acliNanYuEd e+zTLAqkonFz+aTmjpOfw4+jme9xtteDebr01De/660x7dJZ6PRUGo8s6HOR0SECdcJKIF LKrycdknzF8wxO8Ltqev3O9Mf2rQSpVm224PObfHFHn5OZKjTLz5gmSYPJcixyy8rDdUpB 8Opvz0fVQWhm7t1Nppu+jiS5r1YHezx9gNyPZrHIBZ1IU3r/LcrwqWfwxiCRDpq987Mt5J BxUf5l4PvWPnOFpdWgtxrcNzvcIMsyyG+OvqwCNtfu8ZdyF0fgw3JBxWen3AZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vdnxt4hKNzNCd; Tue, 14 May 2024 07:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E7Rkex056376; Tue, 14 May 2024 07:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E7Rkvd056373; Tue, 14 May 2024 07:27:46 GMT (envelope-from git) Date: Tue, 14 May 2024 07:27:46 GMT Message-Id: <202405140727.44E7Rkvd056373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: b9beff373472 - main - editors/lapce: Fix menu display / Improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9beff373472b8bca33b348314518743a6ef1426 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9beff373472b8bca33b348314518743a6ef1426 commit b9beff373472b8bca33b348314518743a6ef1426 Author: Mikael Urankar AuthorDate: 2024-05-14 07:23:19 +0000 Commit: Nuno Teixeira CommitDate: 2024-05-14 07:27:35 +0000 editors/lapce: Fix menu display / Improve port - Fix menu display: https://github.com/lapce/floem/pull/443 - Add desktop file and icon PR: 278950 --- editors/lapce/Makefile | 16 +++- editors/lapce/distinfo | 2 +- ...loem-cosmic-text-0.7.2_src_font_fallback_mod.rs | 21 +++-- editors/lapce/files/patch-floem | 100 +++++++++++++++++++++ 4 files changed, 129 insertions(+), 10 deletions(-) diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile index 86a283e9c45c..a329a39f048d 100644 --- a/editors/lapce/Makefile +++ b/editors/lapce/Makefile @@ -2,7 +2,7 @@ PORTNAME= lapce DISTVERSIONPREFIX= v DISTVERSION= 0.4.0-16 # Cargo.lock patched: `make patch cargo-crates` DISTVERSIONSUFFIX= -g985b07c -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= eduardo@FreeBSD.org @@ -17,15 +17,18 @@ NOT_FOR_ARCHS_REASON_i386= doesn't build: [zstd-sys 2.0.1+zstd.1.5.2] AR_i686_un LIB_DEPENDS= libssh2.so:security/libssh2 \ libgit2.so:devel/libgit2 +RUN_DEPENDS= xdg-desktop-portal>0:deskutils/xdg-desktop-portal -USES= cargo dos2unix gmake localbase:ldflags perl5 pkgconfig ssl xorg +USES= cargo desktop-file-utils dos2unix gmake localbase:ldflags perl5 pkgconfig ssl xorg USE_GITHUB= yes USE_XORG= xcb DOS2UNIX_FILES= cargo-crates/slotmap-1.0.7/src/lib.rs PLIST_FILES= bin/lapce \ - bin/lapce-proxy + bin/lapce-proxy \ + share/applications/dev.lapce.lapce.desktop \ + share/pixmaps/dev.lapce.lapce.png PORTSCOUT= skipv:0.6.0 @@ -36,9 +39,14 @@ CARGO_ENV= RUSTC_BOOTSTRAP=1 OPENSSL_NO_VENDOR=1 # Do not LTO and strip binaries while WIP: # https://github.com/lapce/lapce/issues/2748 LTO_UNSAFE= yes -#post-install: +post-install: # ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce # ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lapce-proxy + ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/extra/images/logo.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/dev.lapce.lapce.png + ${INSTALL_DATA} ${WRKSRC}/extra/linux/dev.lapce.lapce.desktop \ + ${STAGEDIR}${PREFIX}/share/applications post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cargo-crates/fontdb-0.16.2/src/lib.rs diff --git a/editors/lapce/distinfo b/editors/lapce/distinfo index f8c40a559ed9..ba5cc2d26fe7 100644 --- a/editors/lapce/distinfo +++ b/editors/lapce/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1715251140 +TIMESTAMP = 1715629174 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 diff --git a/editors/lapce/files/patch-cargo-crates_floem-cosmic-text-0.7.2_src_font_fallback_mod.rs b/editors/lapce/files/patch-cargo-crates_floem-cosmic-text-0.7.2_src_font_fallback_mod.rs index f42c57f5a143..c08e11b5ef00 100644 --- a/editors/lapce/files/patch-cargo-crates_floem-cosmic-text-0.7.2_src_font_fallback_mod.rs +++ b/editors/lapce/files/patch-cargo-crates_floem-cosmic-text-0.7.2_src_font_fallback_mod.rs @@ -1,11 +1,22 @@ +https://github.com/lapce/cosmic-text/pull/6 + --- cargo-crates/floem-cosmic-text-0.7.2/src/font/fallback/mod.rs.orig 2024-05-09 07:49:44 UTC +++ cargo-crates/floem-cosmic-text-0.7.2/src/font/fallback/mod.rs -@@ -11,7 +11,7 @@ use self::platform::*; +@@ -10,7 +10,7 @@ use self::platform::*; + use self::platform::*; - #[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows",)))] --#[path = "other.rs"] -+#[path = "unix.rs"] +-#[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; - #[cfg(target_os = "macos")] diff --git a/editors/lapce/files/patch-floem b/editors/lapce/files/patch-floem new file mode 100644 index 000000000000..b8771370842f --- /dev/null +++ b/editors/lapce/files/patch-floem @@ -0,0 +1,100 @@ +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>, + } + +@@ -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,