[PR PATCH] cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

[PR PATCH] cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages cargo-c-fix-lfs
https://github.com/void-linux/void-packages/pull/45400

cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #45398 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45400.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cargo-c-fix-lfs-45400.patch --]
[-- Type: text/x-diff, Size: 2573 bytes --]

From fafdb4db3ff30058b05f76c5e3bc79a80a71be27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 19:44:25 +0700
Subject: [PATCH] cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

---
 srcpkgs/cargo-c/patches/libgit2-lfs.patch | 11 +++++++++++
 srcpkgs/cargo-c/template                  | 12 +++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/cargo-c/patches/libgit2-lfs.patch

diff --git a/srcpkgs/cargo-c/patches/libgit2-lfs.patch b/srcpkgs/cargo-c/patches/libgit2-lfs.patch
new file mode 100644
index 0000000000000..c5905e91bcaf7
--- /dev/null
+++ b/srcpkgs/cargo-c/patches/libgit2-lfs.patch
@@ -0,0 +1,11 @@
+--- a/vendor/libgit2-sys/build.rs
++++ b/vendor/libgit2-sys/build.rs
+@@ -79,6 +79,8 @@ fn main() {
+         .define("MATCH_LIMIT", Some("10000000"))
+         .define("MATCH_LIMIT_RECURSION", Some("MATCH_LIMIT"))
+         .define("MAX_NAME_SIZE", Some("32"))
++        .define("_LARGE_FILE_SOURCE", Some("1"))
++        .define("_FILE_OFFSET_BITS", Some("64"))
+         .define("MAX_NAME_COUNT", Some("10000"));
+     // "no symbols" warning on pcre_string_utils.c is because it is only used
+     // when when COMPILE_PCRE8 is not defined, which is the default.
diff --git a/srcpkgs/cargo-c/template b/srcpkgs/cargo-c/template
index ec93a462ed654..bef35193018bd 100644
--- a/srcpkgs/cargo-c/template
+++ b/srcpkgs/cargo-c/template
@@ -1,22 +1,24 @@
 # Template file for 'cargo-c'
 pkgname=cargo-c
-version=0.9.18
+version=0.9.22
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="openssl-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel libcurl-devel"
 short_desc="Build and install C-compatible rust libraries"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="MIT"
 homepage="https://crates.io/crates/cargo-c"
 distfiles="https://github.com/lu-zero/cargo-c/archive/v${version}.tar.gz
  https://github.com/lu-zero/cargo-c/releases/download/v${version}/Cargo.lock"
-checksum="1839c3e31f19eae346c47dcf2084bda80d875a8bb01fb2c55489802c7793c2d8
- 7c4ebb1140e3b4452f7cda6027413fb29449b85c9c35d3f5df3dbed36287ac8c"
+checksum="6af542e3d76e4341693b2e9a9f50abf15b04d82c5f9d1b350110cfac7e914e73
+ 0c59e6fa12196cb57733d889ace5acbbe26ec32a6124324d0e6aa0bae2d2a4c3"
 skip_extraction="Cargo.lock"
 
 post_extract() {
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${wrksrc}
+	cd ${wrksrc}
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock .
+	cargo vendor
 }
 
 post_install() {

Re: [PR PATCH] [Updated] cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages cargo-c-fix-lfs
https://github.com/void-linux/void-packages/pull/45400

cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #45398 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/45400.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cargo-c-fix-lfs-45400.patch --]
[-- Type: text/x-diff, Size: 2616 bytes --]

From a91f6cf0e230d299ed8aeb8e01a106329f5c7a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 3 Aug 2023 19:44:25 +0700
Subject: [PATCH] cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

---
 srcpkgs/cargo-c/patches/libgit2-lfs.patch | 11 +++++++++++
 srcpkgs/cargo-c/template                  | 14 ++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/cargo-c/patches/libgit2-lfs.patch

diff --git a/srcpkgs/cargo-c/patches/libgit2-lfs.patch b/srcpkgs/cargo-c/patches/libgit2-lfs.patch
new file mode 100644
index 0000000000000..c5905e91bcaf7
--- /dev/null
+++ b/srcpkgs/cargo-c/patches/libgit2-lfs.patch
@@ -0,0 +1,11 @@
+--- a/vendor/libgit2-sys/build.rs
++++ b/vendor/libgit2-sys/build.rs
+@@ -79,6 +79,8 @@ fn main() {
+         .define("MATCH_LIMIT", Some("10000000"))
+         .define("MATCH_LIMIT_RECURSION", Some("MATCH_LIMIT"))
+         .define("MAX_NAME_SIZE", Some("32"))
++        .define("_LARGE_FILE_SOURCE", Some("1"))
++        .define("_FILE_OFFSET_BITS", Some("64"))
+         .define("MAX_NAME_COUNT", Some("10000"));
+     // "no symbols" warning on pcre_string_utils.c is because it is only used
+     // when when COMPILE_PCRE8 is not defined, which is the default.
diff --git a/srcpkgs/cargo-c/template b/srcpkgs/cargo-c/template
index ec93a462ed654..6ac322a0a39fe 100644
--- a/srcpkgs/cargo-c/template
+++ b/srcpkgs/cargo-c/template
@@ -1,22 +1,24 @@
 # Template file for 'cargo-c'
 pkgname=cargo-c
-version=0.9.18
+version=0.9.22
 revision=1
 build_style=cargo
-hostmakedepends="pkg-config"
-makedepends="openssl-devel"
+hostmakedepends="pkg-config zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel libcurl-devel"
 short_desc="Build and install C-compatible rust libraries"
 maintainer="oreo639 <oreo6391@gmail.com>"
 license="MIT"
 homepage="https://crates.io/crates/cargo-c"
 distfiles="https://github.com/lu-zero/cargo-c/archive/v${version}.tar.gz
  https://github.com/lu-zero/cargo-c/releases/download/v${version}/Cargo.lock"
-checksum="1839c3e31f19eae346c47dcf2084bda80d875a8bb01fb2c55489802c7793c2d8
- 7c4ebb1140e3b4452f7cda6027413fb29449b85c9c35d3f5df3dbed36287ac8c"
+checksum="6af542e3d76e4341693b2e9a9f50abf15b04d82c5f9d1b350110cfac7e914e73
+ 0c59e6fa12196cb57733d889ace5acbbe26ec32a6124324d0e6aa0bae2d2a4c3"
 skip_extraction="Cargo.lock"
 
 post_extract() {
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock ${wrksrc}
+	cd ${wrksrc}
+	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/Cargo.lock .
+	cargo vendor
 }
 
 post_install() {

Re: [PR PATCH] [Merged]: cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1151 bytes --]

There's a merged pull request on the void-packages repository

cargo-c: use system curl, zlib, libssh2, fix libgit2 lfs
https://github.com/void-linux/void-packages/pull/45400

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #45398 
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->