git: 5e8b82c19762 - main - editors/lapce: Unbreak arm64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Oct 2022 15:32:43 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5e8b82c19762a05ba8ed2cd23acdc4ab301c6306
commit 5e8b82c19762a05ba8ed2cd23acdc4ab301c6306
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-10-06 15:30:28 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-10-06 15:32:08 +0000
editors/lapce: Unbreak arm64
- add upstream patch for process_path 0.1.4 crate
https://github.com/wesleywiser/process_path/pull/13
- bump PORTREVISION
---
editors/lapce/Makefile | 9 ++++++---
.../files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs | 11 +++++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/editors/lapce/Makefile b/editors/lapce/Makefile
index ddc29ed9c3bf..007a02893c6b 100644
--- a/editors/lapce/Makefile
+++ b/editors/lapce/Makefile
@@ -1,6 +1,7 @@
PORTNAME= lapce
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0 # remove openssl-src-* from CARGO-CRATES each update
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= eduardo@FreeBSD.org
@@ -8,10 +9,10 @@ COMMENT= Lightning-fast and Powerful Code Editor
WWW= https://lapce.dev/
LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
-NOT_FOR_ARCHS= i386 arm64
+NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON_i386= doesn't build: [zstd-sys 2.0.1+zstd.1.5.2] AR_i686_unknown_freebsd = None
-NOT_FOR_ARCHS_REASON_arm64= doesn't build: https://github.com/lapce/lapce/issues/1185
BUILD_DEPENDS= p5-Cairo-GObject>0:devel/p5-Cairo-GObject \
p5-FindBin-libs>0:devel/p5-FindBin-libs
@@ -19,7 +20,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libgit2.so:devel/libgit2 \
libssh2.so:security/libssh2
-USES= cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl
+USES= cargo dos2unix gmake gnome localbase:ldflags perl5 pkgconfig \
+ ssl
+DOS2UNIX_FILES= cargo-crates/process_path-0.1.4/src/bsd.rs
USE_GITHUB= yes
USE_GNOME= atk gdkpixbuf2 gtk30 pango
diff --git a/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs b/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs
new file mode 100644
index 000000000000..2a3683c7854d
--- /dev/null
+++ b/editors/lapce/files/patch-cargo-crates_process__path-0.1.4_src_bsd.rs
@@ -0,0 +1,11 @@
+--- cargo-crates/process_path-0.1.4/src/bsd.rs.orig 2022-10-06 14:01:42 UTC
++++ cargo-crates/process_path-0.1.4/src/bsd.rs
+@@ -35,7 +35,7 @@ pub fn get_executable_path() -> Option<PathBuf> {
+ // FreeBSD without procfs
+ if result == 0 {
+ // Convert the string allocated on the stack to a Rust string.
+- let len = unsafe { strlen(buf.as_ptr() as *const i8) };
++ let len = unsafe { strlen(buf.as_ptr() as *const libc::c_char) };
+ unsafe { buf.set_len(len) };
+ match String::from_utf8(buf).ok() {
+ Some(path) => {