From: tranzystorekk <tranzystorekk@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
Date: Sun, 26 Nov 2023 16:47:35 +0100 [thread overview]
Message-ID: <20231126154735.fVMb5UJSqKSRV-O8ndaVaA2xzB5RcsPg6ddiBj4upc4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45976@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2
https://github.com/void-linux/void-packages/pull/45976
[WIP] libgit2: update to 1.7.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [ ] cargo-edit
- [ ] cargo-outdated
Related pending PRs:
- #45829
- #45972
- #45853 Ping @cinerea0
- #46043
<!--
#### 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/45976.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-45976.patch --]
[-- Type: text/x-diff, Size: 31917 bytes --]
From 22149d565f589a3d7f92d2cfa5cb96e2e0bbaaf0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 15:00:53 +0200
Subject: [PATCH 01/26] libgit2: update to 1.7.1
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 8 +++----
3 files changed, 5 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 90018a5616f86..d727effb12251 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1341,7 +1341,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.6 libgit2-1.6.4_1
+libgit2.so.1.7 libgit2-1.7.1_1
libgit2-glib-1.0.so.0 libgit2-glib-0.23.4_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
deleted file mode 100644
index 8d24809f244a1..0000000000000
--- a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001
-From: Oliver Reiche <oliver.reiche@gmail.com>
-Date: Wed, 3 May 2023 12:57:06 +0200
-Subject: [PATCH] Fix missing oid type for "fake" repositories
-
-... otherwise git_tree__parse_raw() will fail to obtain
-the correct oid size, which causes the entire parse to fail.
----
- src/libgit2/repository.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c
-index 804e436abeb..c45c5855058 100644
---- a/src/libgit2/repository.c
-+++ b/src/libgit2/repository.c
-@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb)
- repo = repository_alloc();
- GIT_ERROR_CHECK_ALLOC(repo);
-
-+ repo->oid_type = GIT_OID_DEFAULT;
-+
- git_repository_set_odb(repo, odb);
- *repo_out = repo;
-
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 035b2cebae821..c73d550f11321 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,9 +1,9 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.4
-revision=2
+version=1.7.1
+revision=1
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
hostmakedepends="python3 pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
+checksum=17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 20a283cef34bafb2fd38e7191fdf7eb94603f6c9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 15:40:22 +0200
Subject: [PATCH 02/26] python3-pygit2: update to 1.13.2
---
srcpkgs/python3-pygit2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 848b4abcdaae1..963922ae66676 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
-revision=2
+version=1.13.2
+revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
makedepends="python3-devel libgit2-devel python3-cached-property libssh2-devel
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
homepage="https://www.pygit2.org/"
changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3
+checksum=75c7eb86b47c70f6f1434bcf3b5eb41f4e8006a15cee6bef606651b97d23788c
From efab212f286034e3bae77875e9560ac2d6ae8007 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 15:06:27 +0200
Subject: [PATCH 03/26] libgit2-glib: rebuild for libgit2-1.7
---
srcpkgs/libgit2-glib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 358f81b03d780..63919df2ca93f 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2-glib'
pkgname=libgit2-glib
version=1.1.0
-revision=5
+revision=6
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 4b583e0e84e958894d56434fc7a95a95f9132851 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Sep 2023 15:23:20 +0200
Subject: [PATCH 04/26] calligra: rebuild for libgit2-1.7
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 5020e13a2eac7..421700baadd3c 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=17
+revision=18
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From ae3ea3dfbffbedf316dc6dc850521c3df9c7d100 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Sep 2023 10:39:09 +0200
Subject: [PATCH 05/26] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 4cb4644663800..cac95cb09f1d0 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,10 +1,10 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=6
+revision=7
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
-create_wrksrc=yes
+build_wrksrc=jucipp-v${version}
build_style=cmake
hostmakedepends="pkg-config"
makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel"
@@ -26,10 +26,8 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- mv jucipp-v$version/* .
- rmdir lib/libclangmm lib/tiny-process-library
- mv libclangmm-${_libclangmm_commit} ${wrksrc}/lib/libclangmm
- mv tiny-process-library-${_tiny_commit} lib/tiny-process-library
+ mv -T libclangmm-${_libclangmm_commit} ${build_wrksrc}/lib/libclangmm
+ mv -T tiny-process-library-${_tiny_commit} ${build_wrksrc}/lib/tiny-process-library
}
post_install() {
From 05b607e16f167a63076adcfe1d729600e55d8d9e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 18:24:28 +0200
Subject: [PATCH 06/26] justbuild: rebuild for libgit2-1.7
---
srcpkgs/justbuild/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index e1bf9a8beffd5..c35d38da8b2c8 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.3
-revision=1
+revision=2
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 48047cf0a9778c807851342b71305a21bee6878a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 18:35:31 +0200
Subject: [PATCH 07/26] kup: rebuild for libgit2-1.7
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index b61a1a8c1dfa2..dd3f1dc81df5a 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From 3bcfde6e7ac128b12a4e2af48da57a7d52b41b6a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 16 Sep 2023 16:43:57 +0200
Subject: [PATCH 08/26] horizon: rebuild for libgit2-1.7
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 97ed737c2c561..25c6a5196df51 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From e26c2c1a3cac0d4ff2b629d4eefb0d71e6610b55 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 18:43:42 +0200
Subject: [PATCH 09/26] Fritzing: rebuild for libgit2-1.7
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index 5bdc29d7ff700..74191baecb95b 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=7
+revision=8
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 392a8b28031ad9fa9b53f54f7b841596a257876f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 19:09:16 +0200
Subject: [PATCH 10/26] DarkRadiant: rebuild for libgit2-1.7
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 3a4caeccf8bb8..dc2e7dce866a8 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From fdfd475a6ba4f950ba5b9240a34df50932951d53 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 19:16:52 +0200
Subject: [PATCH 11/26] slcp: rebuild for libgit2-1.7
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 77982f8185be2..5614d4aa82eb0 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=14
+revision=15
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 91502d0a62fb5783a2e02d79afef5156a4c7e765 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 19:18:04 +0200
Subject: [PATCH 12/26] stagit: rebuild for libgit2-1.7
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 5bc0ec404d99a..a12180fa1e788 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=2
+revision=3
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 00eeefcc26b5b29d58fcd6ac687280e332eae071 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 19:23:26 +0200
Subject: [PATCH 13/26] geany-plugins: rebuild for libgit2-1.7
---
srcpkgs/geany-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index f0bb0b04ed80b..fec1cd543ac62 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=1.38.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From cffb4da7a30e14f0d2a2273916dc2ab4bc693c18 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 19:31:30 +0200
Subject: [PATCH 14/26] gnome-builder: rebuild for libgit2-1.7
---
srcpkgs/gnome-builder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a85de84f5dd0d..45b89ab3bb159 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=44.1
-revision=5
+revision=6
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From b69fa33304dee3435c3aa19ce80e74b8e131fe22 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:46:36 +0200
Subject: [PATCH 15/26] common/build-helper/rust.sh: force using system libgit2
library
---
common/build-helper/rust.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index f13ef7aa39568..5f2489c93ea95 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -64,3 +64,6 @@ export RUSTONIG_SYSTEM_LIBONIG=1
# libsqlite3-sys
export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 0aab8d28f79b5f6d0a163100ffc10c85f27531a4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 16:14:34 +0200
Subject: [PATCH 16/26] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/bump-git2.patch | 67 +++++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 68 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/bump-git2.patch
diff --git a/srcpkgs/cargo/patches/bump-git2.patch b/srcpkgs/cargo/patches/bump-git2.patch
new file mode 100644
index 0000000000000..ca6a8a7286149
--- /dev/null
+++ b/srcpkgs/cargo/patches/bump-git2.patch
@@ -0,0 +1,67 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index a99e115..86911a7 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -997,11 +997,11 @@ dependencies = [
+
+ [[package]]
+ name = "git2"
+-version = "0.17.2"
++version = "0.18.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
++checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags 2.3.2",
+ "libc",
+ "libgit2-sys",
+ "log",
+@@ -1012,9 +1012,9 @@ dependencies = [
+
+ [[package]]
+ name = "git2-curl"
+-version = "0.18.0"
++version = "0.19.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
++checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
+ dependencies = [
+ "curl",
+ "git2",
+@@ -1993,9 +1993,9 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.15.2+1.6.4"
++version = "0.16.1+1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
++checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+ dependencies = [
+ "cc",
+ "libc",
+diff --git a/Cargo.toml b/Cargo.toml
+index 1b2acd3..d6cf459 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -31,8 +31,8 @@ env_logger = "0.10.0"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+ fwdansi = "1.1.0"
+-git2 = "0.17.1"
+-git2-curl = "0.18.0"
++git2 = "0.18.0"
++git2-curl = "0.19.0"
+ gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] }
+ glob = "0.3.0"
+@@ -50,7 +50,7 @@ jobserver = "0.1.26"
+ lazy_static = "1.3.0"
+ lazycell = "1.2.0"
+ libc = "0.2.144"
+-libgit2-sys = "0.15.1"
++libgit2-sys = "0.16.1"
+ log = "0.4.17"
+ memchr = "2.1.3"
+ miow = "0.5.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 315a204429f5e..7156ba3fde773 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.73.0
-revision=1
+revision=2
_cargo_revision=0.74.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From d1fb4bb62ab55c2fb7b6ccacd0b52f97a19a52cd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 16:29:28 +0200
Subject: [PATCH 17/26] bat: rebuild for libgit2-1.7
---
srcpkgs/bat/patches/downgrade-git2.patch | 13 -------------
srcpkgs/bat/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/bat/patches/downgrade-git2.patch
diff --git a/srcpkgs/bat/patches/downgrade-git2.patch b/srcpkgs/bat/patches/downgrade-git2.patch
deleted file mode 100644
index c228946832069..0000000000000
--- a/srcpkgs/bat/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e31fbc3..cc4cdf9 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -69,7 +69,7 @@ os_str_bytes = { version = "~6.4", optional = true }
- run_script = { version = "^0.10.0", optional = true}
-
- [dependencies.git2]
--version = "0.18"
-+version = "0.17"
- optional = true
- default-features = false
-
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 55ef7ae8fa22a..a7f31c22a57ae 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.24.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel oniguruma-devel"
@@ -15,10 +15,6 @@ checksum=907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb
export BAT_ASSETS_GEN_DIR="${XBPS_BUILDDIR}/${pkgname}-${version}"
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
vdoc README.md
From f80e79048181d61be915b62c82929287b1f0f186 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:09:09 +0200
Subject: [PATCH 18/26] cargo-update: rebuild for libgit2-1.7
---
srcpkgs/cargo-update/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 95abc2f1a94d7..c318b07004df9 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -1,7 +1,7 @@
# Template file for 'cargo-update'
pkgname=cargo-update
version=13.3.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From e32e695bcf9f2009a8eb704503d561e07e27a6b2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:14:39 +0200
Subject: [PATCH 19/26] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e8ab6178e3a14..2bb4827c27562 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.6.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ checksum=eea9655f4750cb2567eaca9ca4968a3a639f9003242ef733b205bf5410d90c86
make_check=no
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.1
}
post_install() {
From 7e691e87e95f5b3c3f700b8759e0d1da7acd71da Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:22:12 +0200
Subject: [PATCH 20/26] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/bump-git2.patch | 4 ++--
srcpkgs/delta/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch
index 05255c23c9ccb..c670fe74abb6c 100644
--- a/srcpkgs/delta/patches/bump-git2.patch
+++ b/srcpkgs/delta/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 8c0c6d8..4fdaa9d 100644
+index 8c0c6d8..c14a125 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ vte = "0.11.0"
@@ -7,7 +7,7 @@ index 8c0c6d8..4fdaa9d 100644
[dependencies.git2]
-version = "0.16.1"
-+version = "0.17"
++version = "0.18"
default-features = false
features = []
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index e0e2c44370d7b..6dbd1cfb88d55 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.16.5
-revision=2
+revision=3
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel oniguruma-devel"
@@ -14,7 +14,7 @@ distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.
checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.1
}
post_install() {
From aa743a841403ca4de74ce2443754f0e48258679e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Sep 2023 10:29:54 +0200
Subject: [PATCH 21/26] eza: rebuild for libgit2-1.7
---
srcpkgs/eza/patches/downgrade-git2.patch | 13 -------------
srcpkgs/eza/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch
diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch
deleted file mode 100644
index 9f4eb5bee96aa..0000000000000
--- a/srcpkgs/eza/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e6c3e0e..39a34d0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -59,7 +59,7 @@ default-features = false
- features = ["format"]
-
- [dependencies.git2]
--version = "0.18"
-+version = "0.17"
- optional = true
- default-features = false
-
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index b4d9a6c3ed5a9..1313e51e73c70 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.16.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pandoc pkg-config"
makedepends="libgit2-devel"
@@ -13,10 +13,6 @@ changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md
distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz"
checksum=e1c9e313ffb98730e8bbc90a30ea951237f38474108072e9253ae89951ba8cdc
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 33870972757750650a64b1acf1b24f84a53edd43 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:27:24 +0200
Subject: [PATCH 22/26] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/bump-git2.patch | 4 ++--
srcpkgs/git-absorb/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch
index bab771ba1be86..1dc42e8e345e6 100644
--- a/srcpkgs/git-absorb/patches/bump-git2.patch
+++ b/srcpkgs/git-absorb/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 20a0ec5..7b86eed 100644
+index 20a0ec5..2b3482b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ name = "git-absorb"
@@ -7,7 +7,7 @@ index 20a0ec5..7b86eed 100644
[dependencies.git2]
-version = "~0.16"
-+version = "~0.17"
++version = "~0.18"
default-features = false
[dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 8c6dd52ebf277..8dc247d8c29d9 100644
--- a/srcpkgs/git-absorb/template
+++ b/srcpkgs/git-absorb/template
@@ -1,7 +1,7 @@
# Template file for 'git-absorb'
pkgname=git-absorb
version=0.6.10
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -14,7 +14,7 @@ distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.
checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.1
}
post_install() {
From 8ec4274183d06a3b62a1c9341d9bb06d1501ca6b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:35:46 +0200
Subject: [PATCH 23/26] git-cliff: rebuild for libgit2-1.7
---
srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-cliff/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch
deleted file mode 100644
index eda09bc98e9e9..0000000000000
--- a/srcpkgs/git-cliff/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml
-index fbcfbb2..7209a63 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -28,7 +28,7 @@ toml = "0.8.1"
- lazy-regex = "3.0.2"
-
- [dependencies.git2]
--version = "0.18.1"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index d42b45d881562..4ef4320a9ad95 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=1.4.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -17,10 +17,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
checksum=8ec9a2c9cd0e97a8111a82bcf2fce415f40818897bdc76a2c5cc63d99114ec30
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 59064c99a023505392eae7ff05ead4bf78f97631 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:38:46 +0200
Subject: [PATCH 24/26] git-series: rebuild for libgit2-1.7
---
srcpkgs/git-series/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index fe5e461fcbf25..af9a680b13acd 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
# Template file for 'git-series'
pkgname=git-series
version=0.9.1
-revision=17
+revision=18
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
From c71e432ca2ce127ad54f3dea770c9c2623e54aa0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 17:54:49 +0200
Subject: [PATCH 25/26] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/gitui/template | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gitui/patches/bump-git2.patch
diff --git a/srcpkgs/gitui/patches/bump-git2.patch b/srcpkgs/gitui/patches/bump-git2.patch
new file mode 100644
index 0000000000000..905f593d6e96e
--- /dev/null
+++ b/srcpkgs/gitui/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
+index df03ba1..b405ac9 100644
+--- a/asyncgit/Cargo.toml
++++ b/asyncgit/Cargo.toml
+@@ -16,7 +16,7 @@ bitflags = "1"
+ crossbeam-channel = "0.5"
+ easy-cast = "0.5"
+ fuzzy-matcher = "0.3"
+-git2 = "0.17"
++git2 = "0.18"
+ log = "0.4"
+ # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
+ # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 8a04297c2871d..5a90f553b775c 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.24.3
-revision=1
+revision=2
build_style=cargo
make_check_args="-- --skip components::textinput::tests::test_visualize_newline"
hostmakedepends="pkg-config python3"
@@ -14,6 +14,10 @@ changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
checksum=a5fc6b52a4db0037c3351b9743af49c8bb9ccff4dda5bdb064bab9e59f68fde2
+post_patch() {
+ cargo update --package git2@0.17.2 --precise 0.18.1
+}
+
post_install() {
vlicense LICENSE.md
}
From 1e875df6a40d578475aa96bfb2aa20f930489a66 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 8 Sep 2023 18:00:14 +0200
Subject: [PATCH 26/26] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/bump-git2.patch | 4 ++--
srcpkgs/lsd/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/lsd/patches/bump-git2.patch b/srcpkgs/lsd/patches/bump-git2.patch
index 54319caba11e9..058c4b684cd72 100644
--- a/srcpkgs/lsd/patches/bump-git2.patch
+++ b/srcpkgs/lsd/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 30fa892..460cf13 100644
+index 30fa892..1b0d83b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ vsort = "0.1.0"
@@ -7,7 +7,7 @@ index 30fa892..460cf13 100644
[target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies]
# if ssl feature is enabled compilation will fail on arm-unknown-linux-gnueabihf and i686-pc-windows-gnu
-git2 = { version = "0.16", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
++git2 = { version = "0.18", optional = true, default-features = false }
[target.'cfg(unix)'.dependencies]
users = "0.11.*"
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index b07f510bff495..34713e80ba628 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.0.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -25,7 +25,7 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.1
}
post_install() {
next prev parent reply other threads:[~2023-11-26 15:47 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 17:43 [PR PATCH] " tranzystorek-io
2023-09-12 13:10 ` [PR PATCH] [Updated] " tranzystorek-io
2023-09-17 8:46 ` tranzystorek-io
2023-09-17 13:25 ` tranzystorek-io
2023-10-05 16:15 ` tranzystorek-io
2023-11-26 15:47 ` tranzystorekk [this message]
2023-12-01 5:33 ` icp1994
2023-12-01 12:54 ` [PR PATCH] [Updated] " tranzystorekk
2023-12-01 13:14 ` tranzystorekk
2023-12-01 16:32 ` tranzystorekk
2024-02-07 12:15 ` [PR PATCH] [Updated] " tranzystorekk
2024-02-07 12:32 ` [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2 tranzystorekk
2024-02-12 14:05 ` leahneukirchen
2024-02-12 14:35 ` tranzystorekk
2024-02-12 16:07 ` leahneukirchen
2024-02-12 16:09 ` leahneukirchen
2024-02-12 16:40 ` tranzystorekk
2024-02-12 17:30 ` [PR PATCH] [Updated] " tranzystorekk
2024-02-17 13:08 ` tranzystorekk
2024-02-20 17:03 ` tranzystorekk
2024-02-24 11:15 ` tranzystorekk
2024-02-24 11:17 ` tranzystorekk
2024-03-01 14:20 ` tranzystorekk
2024-03-01 15:45 ` tranzystorekk
2024-03-18 15:02 ` tranzystorekk
2024-03-18 16:55 ` tranzystorekk
2024-03-20 16:44 ` tranzystorekk
2024-03-22 8:44 ` tranzystorekk
2024-03-22 22:24 ` [PR PATCH] [Updated] " tranzystorekk
2024-03-23 6:41 ` tranzystorekk
2024-03-23 20:56 ` tranzystorekk
2024-03-24 12:06 ` tranzystorekk
2024-03-25 22:49 ` tranzystorekk
2024-03-26 12:54 ` tranzystorekk
2024-03-26 17:18 ` tranzystorekk
2024-03-28 14:13 ` [PR PATCH] [Merged]: " cinerea0
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231126154735.fVMb5UJSqKSRV-O8ndaVaA2xzB5RcsPg6ddiBj4upc4@z \
--to=tranzystorekk@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).