From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 08:15:07 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 679DA5C32B9; Tue, 6 Apr 2021 08:15:07 +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 4FF0gv2Tfwz3R2C; Tue, 6 Apr 2021 08:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3C990788; Tue, 6 Apr 2021 08:15:07 +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 1368F7ZR090733; Tue, 6 Apr 2021 08:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1368F7qP090732; Tue, 6 Apr 2021 08:15:07 GMT (envelope-from git) Date: Tue, 6 Apr 2021 08:15:07 GMT Message-Id: <202104060815.1368F7qP090732@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f990e2b38bff - main - devel/cargo-c: drop libgit2 < 1.1 workaround after e7d94d42f82e MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f990e2b38bff59c5ff31969f3ab9c64ae47d6728 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 08:15:07 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f990e2b38bff59c5ff31969f3ab9c64ae47d6728 commit f990e2b38bff59c5ff31969f3ab9c64ae47d6728 Author: Jan Beich AuthorDate: 2021-04-06 07:54:52 +0000 Commit: Jan Beich CommitDate: 2021-04-06 08:11:38 +0000 devel/cargo-c: drop libgit2 < 1.1 workaround after e7d94d42f82e --- devel/cargo-c/files/patch-libgit2-1.0 | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/devel/cargo-c/files/patch-libgit2-1.0 b/devel/cargo-c/files/patch-libgit2-1.0 deleted file mode 100644 index 91f08cd36de1..000000000000 --- a/devel/cargo-c/files/patch-libgit2-1.0 +++ /dev/null @@ -1,21 +0,0 @@ -Revert https://github.com/rust-lang/git2-rs/commit/b830b24c8f70 -until devel/libgit2 is updated to 1.1.0 - -warning: libgit2/src/transports/ssh.c:11:10: fatal error: 'libssh2.h' file not found -warning: #include -warning: ^~~~~~~~~~~ -warning: 1 error generated. - -error: failed to run custom build command for `libgit2-sys v0.12.15+1.1.0` - ---- cargo-crates/libgit2-sys-0.12.18+1.1.0/build.rs.orig 2020-12-18 15:47:36 UTC -+++ cargo-crates/libgit2-sys-0.12.18+1.1.0/build.rs -@@ -12,7 +12,7 @@ fn main() { - // To use zlib-ng in zlib-compat mode, we have to build libgit2 ourselves. - if !zlib_ng_compat { - let mut cfg = pkg_config::Config::new(); -- if let Ok(lib) = cfg.atleast_version("1.1.0").probe("libgit2") { -+ if let Ok(lib) = cfg.atleast_version("1.0.1").probe("libgit2") { - for include in &lib.include_paths { - println!("cargo:root={}", include.display()); - }