[PR PATCH] onefetch: update to 2.20.0

[PR PATCH] onefetch: update to 2.20.0

[cinerea0]

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

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

https://github.com/cinerea0/void-packages onefetch
https://github.com/void-linux/void-packages/pull/49584

onefetch: update to 2.20.0
#### Testing the changes
- I tested the changes in this PR: **YES**



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-onefetch-49584.patch --]
[-- Type: text/x-diff, Size: 3940 bytes --]

From 4bc120960d09cf7b54b6796b3029a395151d9e4b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 28 Mar 2024 18:02:34 -0400
Subject: [PATCH] onefetch: update to 2.20.0

---
 .../patches/0001-support-libgit2-1.6.4.patch  | 58 -------------------
 srcpkgs/onefetch/template                     | 14 +++--
 2 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch

diff --git a/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch b/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch
deleted file mode 100644
index 7b4b84d5d340fb..00000000000000
--- a/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4d7970904994a6cc5df6b8b1d3d3effaca061127 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Mon, 18 Dec 2023 10:15:19 +0100
-Subject: [PATCH] support libgit2 1.6.4
-
----
- Cargo.lock | 10 +++++-----
- Cargo.toml |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index f6d5b6c..c5f8048 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1033,11 +1033,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
- 
- [[package]]
- name = "git2"
--version = "0.18.0"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.3.3",
-+ "bitflags 1.3.2",
-  "libc",
-  "libgit2-sys",
-  "log",
-@@ -2263,9 +2263,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.16.1+1.7.1"
-+version = "0.15.2+1.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
-+checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
- dependencies = [
-  "cc",
-  "libc",
-diff --git a/Cargo.toml b/Cargo.toml
-index b77f70d..6004ab7 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -43,7 +43,7 @@ gix-features-for-configuration-only = { package = "gix-features", version = "0.3
- gix = { version = "0.55.2", default-features = false, features = [
-     "max-performance-safe", "blob-diff", "mailmap", "index"
- ] }
--git2 = { version = "0.18.0", default-features = false }
-+git2 = { version = "=0.17.2", default-features = false }
- globset = "0.4.13"
- human-panic = "1.2.1"
- image.workspace = true
--- 
-2.43.0
-
diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index bbb4850e050b4d..de291787bcb430 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,23 +1,29 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.19.0
+version=2.20.0
 revision=1
 build_style=cargo
 make_check_args="-- --skip info::tests::test_style_subtitle"
-hostmakedepends="pkg-config cmake git"
-makedepends="zlib-devel libzstd-devel libgit2-devel"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libzstd-devel"
+checkdepends="git"
 short_desc="Git repository summary on your terminal"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://onefetch.dev"
 changelog="https://github.com/o2sh/onefetch/raw/main/CHANGELOG.md"
 distfiles="https://github.com/o2sh/onefetch/archive/refs/tags/${version}.tar.gz"
-checksum=e6aa7504730de86f307d6c3671875b11a447a4088daf74df280c8f644dea4819
+checksum=385bc8f11c3e1cf168ef6d4c64263ded44af948184a990611c1b30fe6c46e37e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate unimplemented for BE"
 fi
 
+pre_build() {
+	vsed -i Cargo.toml -e "s/zlib-ng/zlib-stock/"
+	cargo update --package flate2
+}
+
 post_install() {
 	vlicense LICENSE.md
 }

Re: [PR PATCH] [Updated] onefetch: update to 2.20.0

[cinerea0]

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

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

https://github.com/cinerea0/void-packages onefetch
https://github.com/void-linux/void-packages/pull/49584

onefetch: update to 2.20.0
#### Testing the changes
- I tested the changes in this PR: **YES**



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-onefetch-49584.patch --]
[-- Type: text/x-diff, Size: 3944 bytes --]

From 323c139e3a186ef725901919900bb1a6e05a0041 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 28 Mar 2024 18:11:49 -0400
Subject: [PATCH] onefetch: update to 2.20.0

---
 .../patches/0001-support-libgit2-1.6.4.patch  | 58 -------------------
 srcpkgs/onefetch/template                     | 14 +++--
 2 files changed, 10 insertions(+), 62 deletions(-)
 delete mode 100644 srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch

diff --git a/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch b/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch
deleted file mode 100644
index 7b4b84d5d340fb..00000000000000
--- a/srcpkgs/onefetch/patches/0001-support-libgit2-1.6.4.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4d7970904994a6cc5df6b8b1d3d3effaca061127 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
- <jan.christian@gruenhage.xyz>
-Date: Mon, 18 Dec 2023 10:15:19 +0100
-Subject: [PATCH] support libgit2 1.6.4
-
----
- Cargo.lock | 10 +++++-----
- Cargo.toml |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index f6d5b6c..c5f8048 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1033,11 +1033,11 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
- 
- [[package]]
- name = "git2"
--version = "0.18.0"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.3.3",
-+ "bitflags 1.3.2",
-  "libc",
-  "libgit2-sys",
-  "log",
-@@ -2263,9 +2263,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
- 
- [[package]]
- name = "libgit2-sys"
--version = "0.16.1+1.7.1"
-+version = "0.15.2+1.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
-+checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
- dependencies = [
-  "cc",
-  "libc",
-diff --git a/Cargo.toml b/Cargo.toml
-index b77f70d..6004ab7 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -43,7 +43,7 @@ gix-features-for-configuration-only = { package = "gix-features", version = "0.3
- gix = { version = "0.55.2", default-features = false, features = [
-     "max-performance-safe", "blob-diff", "mailmap", "index"
- ] }
--git2 = { version = "0.18.0", default-features = false }
-+git2 = { version = "=0.17.2", default-features = false }
- globset = "0.4.13"
- human-panic = "1.2.1"
- image.workspace = true
--- 
-2.43.0
-
diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index bbb4850e050b4d..735ae9696390d8 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,23 +1,29 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.19.0
+version=2.20.0
 revision=1
 build_style=cargo
 make_check_args="-- --skip info::tests::test_style_subtitle"
-hostmakedepends="pkg-config cmake git"
-makedepends="zlib-devel libzstd-devel libgit2-devel"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libzstd-devel"
+checkdepends="git"
 short_desc="Git repository summary on your terminal"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://onefetch.dev"
 changelog="https://github.com/o2sh/onefetch/raw/main/CHANGELOG.md"
 distfiles="https://github.com/o2sh/onefetch/archive/refs/tags/${version}.tar.gz"
-checksum=e6aa7504730de86f307d6c3671875b11a447a4088daf74df280c8f644dea4819
+checksum=385bc8f11c3e1cf168ef6d4c64263ded44af948184a990611c1b30fe6c46e37e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="exr crate unimplemented for BE"
 fi
 
+pre_build() {
+	vsed -i Cargo.toml -e "s/zlib-ng/zlib-stock/"
+	cargo update --package flate2@1.0
+}
+
 post_install() {
 	vlicense LICENSE.md
 }

Re: [PR PATCH] [Merged]: onefetch: update to 2.20.0

[cinerea0]

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

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

onefetch: update to 2.20.0
https://github.com/void-linux/void-packages/pull/49584

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**