From nobody Thu Oct 06 15:32:43 2022 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 4MjwRv5pY8z4drCv; Thu, 6 Oct 2022 15:32:43 +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 4MjwRv5Lgjz3PKm; Thu, 6 Oct 2022 15:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665070363; 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=xjN9wKMGCuqNaap0RH52frklCUweeYfw17cDPqymQ9Q=; b=lRrWVJwB0uzMS4dikQiF0HoDdz5f59KOkhRHEArll9b3qWIAIz769oY323kaajKhHqOq9R sqU07xkLPc6Hha+o4o5NgIwxKDnkGU1+XAWTtSOwGZ4MRIwCllClTxnXvYCjT1xUTzCL6D PYSe0vBDLy0Oo9xDV0SSm8zYEWX4Qn1sQY4z7pCNGYI09Ipz74J6+UVUjF6/nhDVG/otD/ I/GRwzaVysApffpsQmvazOkXKFc9Kgr2Mhl9Bux2ZgNg5fwTOh6+ab5gFhQUDsS9/1QCj+ W6feOzuEVMMxvBSOg9rwlqgz/cC4f13dlK30mghhNB335sERXXslzQBpC+UFNw== 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 4MjwRv45wvzHjb; Thu, 6 Oct 2022 15:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 296FWha9067297; Thu, 6 Oct 2022 15:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296FWhN2067296; Thu, 6 Oct 2022 15:32:43 GMT (envelope-from git) Date: Thu, 6 Oct 2022 15:32:43 GMT Message-Id: <202210061532.296FWhN2067296@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: 5e8b82c19762 - main - editors/lapce: Unbreak arm64 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 5e8b82c19762a05ba8ed2cd23acdc4ab301c6306 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665070363; 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=xjN9wKMGCuqNaap0RH52frklCUweeYfw17cDPqymQ9Q=; b=J9SzcWV+mzwF/uzrIXYQw8lLqgpFctPs4AtDuy4TseEJj3G1CDxM4dxnLdnwy3G4V14k5e 8/D5phjeTWljW6bT3DNov/us1PJhefUj9a08NiM0PzlR3BrRSDcdP3wIA6z1hkN9+KJQ8L QpMbbjYMNZhXk39WbwNq3bZoOg5p5z484kVjyIAZbnDLaiqb4jbTy7cGxdMf0pTDGBf2K5 z84YYi2kWMcVKuRdtcDWDxOS/eM97y8GofXymdR0herPuqi2s97pMx3eoHI3fIlrT/xgdv XZIFqgjDFFwcuHbMfts7dhNLHDKFXclh1qzbmzVuC7Ut33BdUrvRiRE2bzQMHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665070363; a=rsa-sha256; cv=none; b=txg39sJwIPAWhABSISi7okgOTvHbKoIHQgHxw1feLXnWwugjAiXTZeWBzNUs0ZdamwSk73 IJFoylSX4R5XD8cz1bX0E6T08fEegrJ4Bia74I2BGi5MvNjigfdsX/28waWehoNYaUVvk2 C+/naf6OaA8w3mFm7ctLZjKzdrvjtTvl6iDaDy5wFH81jUy6Wph7tHh5UvWAozojSm0QZ3 WGcuP5tpsexm109WNdJdKZvkJ041IhsJBOb0qqSkzvj21klSQbnNd6w8PGl/L7SY7u7nAt BIIVlDTQfyTrOe7ENuFZXL6W1q0zafn8brnnF+81kDi6UW8MfnckCL0zOcH/Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e8b82c19762a05ba8ed2cd23acdc4ab301c6306 commit 5e8b82c19762a05ba8ed2cd23acdc4ab301c6306 Author: Nuno Teixeira AuthorDate: 2022-10-06 15:30:28 +0000 Commit: Nuno Teixeira 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 { + // 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) => {