* [PR PATCH] [WIP] libgit2: update to 1.7.1
@ 2023-09-08 17:43 tranzystorek-io
2023-09-12 13:10 ` [PR PATCH] [Updated] " tranzystorek-io
` (34 more replies)
0 siblings, 35 replies; 36+ messages in thread
From: tranzystorek-io @ 2023-09-08 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
There is a new pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/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
<!--
#### 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: 32736 bytes --]
From 5ede1c67614aebb2f3086ebe14ba233274933c0e 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/25] 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 531b3345e230f..23aef923ed71f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1348,7 +1348,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 abdac006f88f82c8b54b53876409b7733e93e0cc 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/25] python3-pygit2: update to 1.13.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index b8db662c7715a..16e5da6b281d5 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
+version=1.13.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8
From 5fa4ffb44166079266de0a23b25b19cb1130d244 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/25] 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 f20b53b73211c..358f81b03d780 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=4
+revision=5
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 857a77abec3092dbb961dfa30850c6b8af45bae5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 15:27:46 +0200
Subject: [PATCH 04/25] juCi++: update to 1.8.0
---
srcpkgs/juCi++/template | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 4cb4644663800..43702d828c1d2 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
-_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
-_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
-create_wrksrc=yes
+version=1.8.0
+revision=1
+_libclangmm_commit="5611eb3d9e69486f85a431fbaae03c065f62c2d8"
+_tiny_commit="aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac"
+build_wrksrc=jucipp-v${version}
build_style=cmake
hostmakedepends="pkg-config"
makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel"
@@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp"
distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="e792ddb95328ab055b0a4b7eb18669b3337648a4a931ee6ede541c2e95a686e9
- 4ed79294cb67ae56a4d72e50c4188c49215df51c8b9a466fc0aeeaab2dbc7a3f
- a808e5e3bdb43a04c862da968588ceffb1e46b85a32b430d5e27f243b37f5098"
+checksum="f28e5c3fd7b3d92274654c4253667a720cacfcbe06b6f93f2a3111bdabc60cce
+ 391e1163c5c5981b7c362b0265e95cd78b4414c3c0f011a48c269f08806be12f
+ 2faf40246f6d8a297b777e1ec7df5e3a060224967a7664de350d6cd42ef08b06"
nocross=yes #clang cannot be installed as makedepends when cross compiling
case "$XBPS_TARGET_MACHINE" in
@@ -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 55c15cf47cbf6d6df658e255606a28fb12c93671 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:07:22 +0200
Subject: [PATCH 05/25] 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 e433b9dba5bbd..5020e13a2eac7 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=16
+revision=17
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 9c2337782d249bdaf942bfdf820856a8591ebb8f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:32:04 +0200
Subject: [PATCH 06/25] horizon: update to 2.5.0
---
srcpkgs/horizon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 1d1b8cf1891c2..97ed737c2c561 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,13 +1,13 @@
# Template file for 'horizon'
pkgname=horizon
-version=2.4.0
-revision=3
+version=2.5.0
+revision=1
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
make_use_env=yes
hostmakedepends="pkg-config glib-devel"
-makedepends="cairomm-devel librsvg-devel sqlite-devel boost-devel
+makedepends="cairomm-devel librsvg-devel sqlite-devel
glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel
gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
short_desc="Free EDA package"
@@ -16,7 +16,7 @@ license="GPL-3.0-only"
homepage="https://horizon-eda.org/"
changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=e1165ec11dc222fd5c41a1da752b2aae44eca80f6f785dd4069dcdd225ae1d53
+checksum=c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4
if [ "$CROSS_BUILD" ]; then
make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"
From 55ad12e81445ddb5623defea20ede91e6b88cd64 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 07/25] 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 51a41c2b02b84..54e0a0cea6dd6 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.1
-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 a7152b385394bcbaf6f6745b45898295d1355598 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 08/25] 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 c5dd9ce10cba8aad189bf41671e0f2019695d29f 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/25] 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 fae4e004246ce0c0a8b1e7c03173ee2939f12f7d 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/25] 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 8830b3a61c06b..219ac3d66adef 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From bb595c6098fc487884042ed9028eae8951be7232 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/25] 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 1aacd9d0cec264761a7b8df6b80940c37e1d84d6 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/25] 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 ee27d04171d85..9f0bdb3a8c1e5 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 76ca96de3982c1dfcb5b08c63629395e8cf08c78 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/25] 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 7f4bd83a61fd72de6ce69597dabf68b18f061dbf 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/25] 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 11cff69fe7fb9..a85de84f5dd0d 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=4
+revision=5
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From aada6b289542d86661512e87f85b6b23e99013df 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/25] 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 f689f7c7f9d96..c58706eb8bf08 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -57,3 +57,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
# onig-sys
export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From b853d4a89d7d38ba00b9c0656aa3cbabb9f0d582 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/25] 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..e91ae2b195f3e
--- /dev/null
+++ b/srcpkgs/cargo/patches/bump-git2.patch
@@ -0,0 +1,67 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 55a625a..81afa08 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -987,11 +987,11 @@ dependencies = [
+
+ [[package]]
+ name = "git2"
+-version = "0.17.1"
++version = "0.18.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5"
++checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags 2.2.1",
+ "libc",
+ "libgit2-sys",
+ "log",
+@@ -1002,9 +1002,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",
+@@ -1936,9 +1936,9 @@ checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.15.1+1.6.4"
++version = "0.16.1+1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7"
++checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+ dependencies = [
+ "cc",
+ "libc",
+diff --git a/Cargo.toml b/Cargo.toml
+index c45dad5..fdb740f 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.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
+ glob = "0.3.0"
+@@ -51,7 +51,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 1e9dd3d652197..e076a065ee3f8 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.71.1
-revision=2
+revision=3
_cargo_revision=0.72.2
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 5b714bfcbfb60990ae8ab350a1cba89e47a562db 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/25] bat: rebuild for libgit2-1.7
---
srcpkgs/bat/patches/bump-git2.patch | 4 ++--
srcpkgs/bat/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
index 842b57d4ee6b3..46da66839ecf8 100644
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 44460e0..78dfbde 100644
+index 44460e0..794fc50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
@@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644
[dependencies.git2]
-version = "0.16"
-+version = "0.17"
++version = "0.18"
optional = true
default-features = false
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..09c30682ecc45 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=2
+revision=3
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.0
}
pre_build() {
From 5b9e597994e36b2af42be4111349e6691a1f1fc3 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/25] cargo-update: rebuild for libgit2-1.7
---
srcpkgs/cargo-update/patches/bump-git2.patch | 4 ++--
srcpkgs/cargo-update/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
index 90a31fbdcb02c..e11ebe6ed11df 100644
--- a/srcpkgs/cargo-update/patches/bump-git2.patch
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index e62e9c8..1aa0658 100644
+index e62e9c8..ade0e58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ tabwriter = "1.2"
@@ -7,7 +7,7 @@ index e62e9c8..1aa0658 100644
regex = "1.6"
serde = "1.0"
-git2 = "0.16"
-+git2 = "0.17"
++git2 = "0.18"
home = "0.5"
toml = "0.5"
hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index d8347b989882f..90ef50ae22d33 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.0.4
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From dfc796d60d5034673f9ee443dd74ad64735e5f4b 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/25] 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 5f3e962216af8..da1ff563c68d4 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.5.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ checksum=709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325
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.0
}
post_install() {
From 90b8cfc47f2c170641d7c46dde314cf58bd9a798 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/25] 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..b410308087ec2 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.0
}
post_install() {
From 07cb4b115db21feedd185dc93a60849f546804ba 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 21/25] 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..266c7505387e4 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.0
}
post_install() {
From 096d1beb0b4b3f2812413225bdfcede63a7dafc0 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 22/25] 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 dd5a3ece05c8e..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 2cab8ec..66b5a8f 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -28,7 +28,7 @@ toml = "0.7.6"
- lazy-regex = "3.0.1"
-
- [dependencies.git2]
--version = "0.18.0"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index c879921e761dd..dbd259be7025e 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.3.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=3c130ebbd3121d3994ecd1ff1062220de610c7491ada02f9d421c8869674c386
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 5c56ae07e33031e28e5049201db3fadba4b9fe89 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 23/25] 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 9a48a447916a2ba2743620ea9c5917e4481cc672 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 24/25] gitui: update to 0.24.2
---
srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/gitui/template | 10 +++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
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 0baff743d5d2f..792f22aaa43b4 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
-version=0.23.0
-revision=2
+version=0.24.2
+revision=1
build_style=cargo
make_check_args="-- --skip components::textinput::tests::test_visualize_newline"
hostmakedepends="pkg-config python3"
@@ -12,7 +12,11 @@ license="MIT"
homepage="https://github.com/extrawurst/gitui"
changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md"
distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=5180d5d8fd2fe6400148d6078b4b318c7530ca6c27ea8d8c0882f2e4d9064a80
+checksum=f8a0a4b3117a40d5fcfe29618d350027bebe3fbcee39f0aef85cb9a5325453b7
+
+post_patch() {
+ cargo update --package git2@0.17.2 --precise 0.18.0
+}
post_install() {
vlicense LICENSE.md
From 78696d3c709feeb134dc6c5295995dbc2754a659 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 25/25] 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..a2f790c973017 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.0
}
post_install() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
@ 2023-09-12 13:10 ` tranzystorek-io
2023-09-17 8:46 ` tranzystorek-io
` (33 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorek-io @ 2023-09-12 13:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/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
<!--
#### 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: 32587 bytes --]
From 25ad07987c5947d52b2cbe32e7f95c7f95f916cb 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/25] 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 c407ffde9b8fd..0676e6c6bca3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1348,7 +1348,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 2358d8a24c6159c766297b9f1c596fd2dc24fad9 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/25] python3-pygit2: update to 1.13.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index b8db662c7715a..16e5da6b281d5 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
+version=1.13.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8
From b734fa8389d5efca1b1bf2fb5952b92f1173d874 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/25] 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 f20b53b73211c..358f81b03d780 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=4
+revision=5
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From a446653ed468c9f6f450db4bbe89629c2f740883 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 15:27:46 +0200
Subject: [PATCH 04/25] juCi++: update to 1.8.0
---
srcpkgs/juCi++/template | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 4cb4644663800..43702d828c1d2 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
-_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
-_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
-create_wrksrc=yes
+version=1.8.0
+revision=1
+_libclangmm_commit="5611eb3d9e69486f85a431fbaae03c065f62c2d8"
+_tiny_commit="aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac"
+build_wrksrc=jucipp-v${version}
build_style=cmake
hostmakedepends="pkg-config"
makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel"
@@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp"
distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz
https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz
https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz"
-checksum="e792ddb95328ab055b0a4b7eb18669b3337648a4a931ee6ede541c2e95a686e9
- 4ed79294cb67ae56a4d72e50c4188c49215df51c8b9a466fc0aeeaab2dbc7a3f
- a808e5e3bdb43a04c862da968588ceffb1e46b85a32b430d5e27f243b37f5098"
+checksum="f28e5c3fd7b3d92274654c4253667a720cacfcbe06b6f93f2a3111bdabc60cce
+ 391e1163c5c5981b7c362b0265e95cd78b4414c3c0f011a48c269f08806be12f
+ 2faf40246f6d8a297b777e1ec7df5e3a060224967a7664de350d6cd42ef08b06"
nocross=yes #clang cannot be installed as makedepends when cross compiling
case "$XBPS_TARGET_MACHINE" in
@@ -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 a10e8dd4999ca89063a0a24aa04a7b9fbf159390 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:07:22 +0200
Subject: [PATCH 05/25] 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 e433b9dba5bbd..5020e13a2eac7 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=16
+revision=17
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From a6bc5c25bbfbbf28090398054f19410606d7f998 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 22 Aug 2023 16:32:04 +0200
Subject: [PATCH 06/25] horizon: update to 2.5.0
---
srcpkgs/horizon/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 1d1b8cf1891c2..97ed737c2c561 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,13 +1,13 @@
# Template file for 'horizon'
pkgname=horizon
-version=2.4.0
-revision=3
+version=2.5.0
+revision=1
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
make_use_env=yes
hostmakedepends="pkg-config glib-devel"
-makedepends="cairomm-devel librsvg-devel sqlite-devel boost-devel
+makedepends="cairomm-devel librsvg-devel sqlite-devel
glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel
gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
short_desc="Free EDA package"
@@ -16,7 +16,7 @@ license="GPL-3.0-only"
homepage="https://horizon-eda.org/"
changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=e1165ec11dc222fd5c41a1da752b2aae44eca80f6f785dd4069dcdd225ae1d53
+checksum=c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4
if [ "$CROSS_BUILD" ]; then
make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"
From 9bcac39e122956a4c66fb417a187691f66fc9722 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 07/25] 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 51a41c2b02b84..54e0a0cea6dd6 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.1
-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 f434dc8557a0c648fd6da2c95e80ebef156d3bfa 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 08/25] 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 d35547f2623ce1beff6adb4023e968b99a978fdc 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/25] 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 6dc2d5c2ea1c69ca0cc3dd391b0fb531f1328c1c 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/25] 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 8830b3a61c06b..219ac3d66adef 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 753215ed9f4654427ef07a197c2368f45a4089e2 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/25] 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 7c6857b0d59a682ee17a140812e809510ce5923a 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/25] 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 ee27d04171d85..9f0bdb3a8c1e5 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 4aab906e0a49ba4668c875da4d7920438c2e317b 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/25] 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 3f739898a6763b721aea04fa47e625cb8ff2ac03 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/25] 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 11cff69fe7fb9..a85de84f5dd0d 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=4
+revision=5
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 9409dcf140bf9f3c6b30154b0e7a61cc2ab34cd6 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/25] 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 f689f7c7f9d96..c58706eb8bf08 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -57,3 +57,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
# onig-sys
export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From e0bbc266a942367193a768ae46123437389ef60d 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/25] 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..e91ae2b195f3e
--- /dev/null
+++ b/srcpkgs/cargo/patches/bump-git2.patch
@@ -0,0 +1,67 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 55a625a..81afa08 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -987,11 +987,11 @@ dependencies = [
+
+ [[package]]
+ name = "git2"
+-version = "0.17.1"
++version = "0.18.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5"
++checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e"
+ dependencies = [
+- "bitflags 1.3.2",
++ "bitflags 2.2.1",
+ "libc",
+ "libgit2-sys",
+ "log",
+@@ -1002,9 +1002,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",
+@@ -1936,9 +1936,9 @@ checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.15.1+1.6.4"
++version = "0.16.1+1.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7"
++checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
+ dependencies = [
+ "cc",
+ "libc",
+diff --git a/Cargo.toml b/Cargo.toml
+index c45dad5..fdb740f 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.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
+ glob = "0.3.0"
+@@ -51,7 +51,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 1e9dd3d652197..e076a065ee3f8 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.71.1
-revision=2
+revision=3
_cargo_revision=0.72.2
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From b85ab7063c22a0aa32bba9fec56815819853a93f 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/25] bat: rebuild for libgit2-1.7
---
srcpkgs/bat/patches/bump-git2.patch | 4 ++--
srcpkgs/bat/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
index 842b57d4ee6b3..46da66839ecf8 100644
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 44460e0..78dfbde 100644
+index 44460e0..794fc50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
@@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644
[dependencies.git2]
-version = "0.16"
-+version = "0.17"
++version = "0.18"
optional = true
default-features = false
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..09c30682ecc45 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=2
+revision=3
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.0
}
pre_build() {
From aec98c4ed799cbb17ff2cebd6cfa7fee00f148ec 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/25] cargo-update: rebuild for libgit2-1.7
---
srcpkgs/cargo-update/patches/bump-git2.patch | 4 ++--
srcpkgs/cargo-update/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
index 90a31fbdcb02c..e11ebe6ed11df 100644
--- a/srcpkgs/cargo-update/patches/bump-git2.patch
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index e62e9c8..1aa0658 100644
+index e62e9c8..ade0e58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ tabwriter = "1.2"
@@ -7,7 +7,7 @@ index e62e9c8..1aa0658 100644
regex = "1.6"
serde = "1.0"
-git2 = "0.16"
-+git2 = "0.17"
++git2 = "0.18"
home = "0.5"
toml = "0.5"
hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index d8347b989882f..90ef50ae22d33 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.0.4
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From bba598f67ddf7dad6e1a830eb905ceff4c2b1e9c 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/25] 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 5f3e962216af8..da1ff563c68d4 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.5.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ checksum=709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325
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.0
}
post_install() {
From e4ac3f9f27c6d8b08f132aee17f2ff93e2300d7b 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/25] 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..b410308087ec2 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.0
}
post_install() {
From f3bfea3d4b6969b73195d4d41d7faa46db8d8600 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 21/25] 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..266c7505387e4 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.0
}
post_install() {
From d2933915fcfd8606be655d9fbdac9e1883f352b7 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 22/25] 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 dd5a3ece05c8e..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 2cab8ec..66b5a8f 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -28,7 +28,7 @@ toml = "0.7.6"
- lazy-regex = "3.0.1"
-
- [dependencies.git2]
--version = "0.18.0"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index c879921e761dd..dbd259be7025e 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.3.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=3c130ebbd3121d3994ecd1ff1062220de610c7491ada02f9d421c8869674c386
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 862de2ae0186e28bf730e87e90521b0b5d6f2922 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 23/25] 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 47aef472fca645101829127629c1f6c4bb76dfdb 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 24/25] 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..546e479ed8f37 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.0
+}
+
post_install() {
vlicense LICENSE.md
}
From da2328075db117e221abe2d92dc2146e86dec34a 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 25/25] 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..a2f790c973017 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.0
}
post_install() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 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
` (32 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorek-io @ 2023-09-17 8:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/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: 31693 bytes --]
From d0c97b9e947177eb7869bc80d66610388460181c 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/25] 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 d2791c238eada..86f15b0875e0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1347,7 +1347,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 c5608f9811f802a4710fc0c0ab560bc66f5d1622 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/25] python3-pygit2: update to 1.13.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index b8db662c7715a..16e5da6b281d5 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
+version=1.13.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8
From 3006a03501cba639f0e533be99d42771082c0075 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/25] 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 f20b53b73211c..358f81b03d780 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=4
+revision=5
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From ccfeaf36c39dccbf46c0fcdf44e483964295106c 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 04/25] 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 45c39840fc340b8ce1af587f76fb84812262e052 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 05/25] 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 51a41c2b02b84..54e0a0cea6dd6 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.1
-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 e8c606fbf065942846185483ae4546ef1eacb40d 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 06/25] 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 baa86184b09a8a6e89965703e38e9b3e47577bf3 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 07/25] 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 61dc0ae22b99d2a2451abff57befb8774bb38ca2 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 08/25] 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 c7caf8c0e24b4a480d54d1988a7fe1fa32ce2f12 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 09/25] 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 8830b3a61c06b..219ac3d66adef 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 40ba96689c386b59a53ebc5c156ba112658b9689 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 10/25] 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 8ca3501be8750a0a291001230573d9c8523a4b74 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 11/25] 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 ee27d04171d85..9f0bdb3a8c1e5 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 0938086753762a105c8d7819856af1b045b5a2fa 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 12/25] 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 240a26f77dcb1253ed2e9b2fafc8b779778726a2 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 13/25] 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 11cff69fe7fb9..a85de84f5dd0d 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=4
+revision=5
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 94f5297d08b93c1fa3a350f3d2dd536c3aaeef63 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 14/25] 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 f689f7c7f9d96..c58706eb8bf08 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -57,3 +57,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
# onig-sys
export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 6f6138c4a345df362f56e548c0135264256b2ca1 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 15/25] 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 d5213857e7e92..dc99074321c7f 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.72.0
-revision=1
+revision=2
_cargo_revision=0.73.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From f1338d4eb795b90dec1ec604cc31eaf62d81fa7e 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 16/25] bat: rebuild for libgit2-1.7
---
srcpkgs/bat/patches/bump-git2.patch | 4 ++--
srcpkgs/bat/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
index 842b57d4ee6b3..46da66839ecf8 100644
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 44460e0..78dfbde 100644
+index 44460e0..794fc50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
@@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644
[dependencies.git2]
-version = "0.16"
-+version = "0.17"
++version = "0.18"
optional = true
default-features = false
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..09c30682ecc45 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=2
+revision=3
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.0
}
pre_build() {
From e728aecda15dce0e9e76a9cb3a1ba7be9e8452a5 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 17/25] cargo-update: rebuild for libgit2-1.7
---
srcpkgs/cargo-update/patches/bump-git2.patch | 4 ++--
srcpkgs/cargo-update/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
index 90a31fbdcb02c..e11ebe6ed11df 100644
--- a/srcpkgs/cargo-update/patches/bump-git2.patch
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index e62e9c8..1aa0658 100644
+index e62e9c8..ade0e58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ tabwriter = "1.2"
@@ -7,7 +7,7 @@ index e62e9c8..1aa0658 100644
regex = "1.6"
serde = "1.0"
-git2 = "0.16"
-+git2 = "0.17"
++git2 = "0.18"
home = "0.5"
toml = "0.5"
hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index d8347b989882f..90ef50ae22d33 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.0.4
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From ad4f5ba704093963418d3228db09792dae775bb8 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 18/25] 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 5f3e962216af8..da1ff563c68d4 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.5.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ checksum=709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325
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.0
}
post_install() {
From 7e677885494d5049cb99b540dc549834a9913a45 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 19/25] 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..b410308087ec2 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.0
}
post_install() {
From 6a19db1be6594aa03dc906133b2d493eebd4787a 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 20/25] 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 dc1b3839c389b..6ec957062188b 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.12.0
-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=766e754c9f4632b92e4a773ac496dee8b6b83fdc9b8ed9514750058039fc5a83
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From de45eaa38adc4c069c968da5ddcba74807c35ede 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 21/25] 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..266c7505387e4 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.0
}
post_install() {
From ed427ff60316d4e38018ee763f75211df33b5060 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 22/25] 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 dd5a3ece05c8e..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 2cab8ec..66b5a8f 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -28,7 +28,7 @@ toml = "0.7.6"
- lazy-regex = "3.0.1"
-
- [dependencies.git2]
--version = "0.18.0"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index c879921e761dd..dbd259be7025e 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.3.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=3c130ebbd3121d3994ecd1ff1062220de610c7491ada02f9d421c8869674c386
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 5387f234121d4883bae378cbbcaff4800731010b 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 23/25] 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 c4c2adb095c8af0edf3df690cbedbdb68f56402c 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 24/25] 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..546e479ed8f37 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.0
+}
+
post_install() {
vlicense LICENSE.md
}
From 9935f7727f806b089e1a7318bffdfcc8b561d0d2 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 25/25] 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..a2f790c973017 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.0
}
post_install() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 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
` (31 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorek-io @ 2023-09-17 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/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: 32385 bytes --]
From d448f4979b5c8c2bbaea31958acee8541e90aa92 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 d2791c238eada..86f15b0875e0b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1347,7 +1347,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 ea93fde7f3c3d4d9f96476a5e40d4ea1fcfa026f 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.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index b8db662c7715a..16e5da6b281d5 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
+version=1.13.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8
From 32dcc26438de045392de46263c207f2b00936c44 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 f20b53b73211c..358f81b03d780 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=4
+revision=5
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 2e7d3569f5d2e296a8c8f154f4b59cf7421668ad 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 73a03817702c93001809ee6d34b09ce2c93b5d2b 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 bff3c3af74e60fa09df2792a081cb4bf38662da1 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 51a41c2b02b84..54e0a0cea6dd6 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.1
-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 8318463f27970e6237625b758b144c53ebad79a3 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 8e2f89d5f1d5a15332fa7947c95025cf2690e3e7 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 2ef71d6a97e9797a9f19cf4e2bffcf4d24aeb4cc 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 36e829b573cfe89ed869ff7488fe286cd6f5553b 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 8830b3a61c06b..219ac3d66adef 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 787ff463e183f590d9822a00ae938d84429dc104 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 71c9340c3d260324fa4b8dd1c442298f0d2eb335 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 ee27d04171d85..9f0bdb3a8c1e5 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 f0de1b2015dce212716f894eecebb4ed8abd3a37 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 4465336aab57f6ae7286e6de9bf76dfb758682e4 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 11cff69fe7fb9..a85de84f5dd0d 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=4
+revision=5
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From d2bd352da20e8ec17ce13cccaa0d1393e8982fef 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 f689f7c7f9d96..c58706eb8bf08 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -57,3 +57,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
# onig-sys
export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 7052b100e466fa39a0e2c05107bc9719ee14493c 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 d5213857e7e92..dc99074321c7f 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.72.0
-revision=1
+revision=2
_cargo_revision=0.73.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 17c465e5bf8101ff60d892af03c7747563f62999 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/bump-git2.patch | 4 ++--
srcpkgs/bat/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
index 842b57d4ee6b3..46da66839ecf8 100644
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 44460e0..78dfbde 100644
+index 44460e0..794fc50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
@@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644
[dependencies.git2]
-version = "0.16"
-+version = "0.17"
++version = "0.18"
optional = true
default-features = false
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..09c30682ecc45 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=2
+revision=3
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.0
}
pre_build() {
From 83af70002f95702ae31426c3faa0f427939d9df1 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/patches/bump-git2.patch | 4 ++--
srcpkgs/cargo-update/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
index 90a31fbdcb02c..e11ebe6ed11df 100644
--- a/srcpkgs/cargo-update/patches/bump-git2.patch
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index e62e9c8..1aa0658 100644
+index e62e9c8..ade0e58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ tabwriter = "1.2"
@@ -7,7 +7,7 @@ index e62e9c8..1aa0658 100644
regex = "1.6"
serde = "1.0"
-git2 = "0.16"
-+git2 = "0.17"
++git2 = "0.18"
home = "0.5"
toml = "0.5"
hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index d8347b989882f..90ef50ae22d33 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.0.4
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From 324da54d023fc17af8cf23b0e4c96d8f47339e39 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 5f3e962216af8..da1ff563c68d4 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.5.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ checksum=709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325
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.0
}
post_install() {
From 7ca739c4e55ee436e15d48bb54bec8e72b4a01a4 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..b410308087ec2 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.0
}
post_install() {
From 6db17513db1af43816f89eda4413a01f8f80ace9 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 dc1b3839c389b..6ec957062188b 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.12.0
-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=766e754c9f4632b92e4a773ac496dee8b6b83fdc9b8ed9514750058039fc5a83
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 1683797ceeed576c40ba6dc7011889b0f1933f6b 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..266c7505387e4 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.0
}
post_install() {
From 71fe4cd6dd00eebc69de0b733c559fb514243a52 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 dd5a3ece05c8e..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 2cab8ec..66b5a8f 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -28,7 +28,7 @@ toml = "0.7.6"
- lazy-regex = "3.0.1"
-
- [dependencies.git2]
--version = "0.18.0"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index c879921e761dd..dbd259be7025e 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.3.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=3c130ebbd3121d3994ecd1ff1062220de610c7491ada02f9d421c8869674c386
-post_patch() {
- cargo update --package git2@0.18.0 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 01297e5adec54046c416b574a4c02c0812a5c946 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 5c1dff8ef09aee4069281b192071cc9971e7cbce 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..546e479ed8f37 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.0
+}
+
post_install() {
vlicense LICENSE.md
}
From 7b4e40c65e917a801946fd7138871cc3e069448d 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..a2f790c973017 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.0
}
post_install() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (2 preceding siblings ...)
2023-09-17 13:25 ` tranzystorek-io
@ 2023-10-05 16:15 ` tranzystorek-io
2023-11-26 15:47 ` tranzystorekk
` (30 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorek-io @ 2023-10-05 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/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: 31704 bytes --]
From 9779c3bfab748771553b569ace2ffeecf24b52e9 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 941a8d6e804c8..9ff0f10cd511f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1344,7 +1344,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 d29698d6aba611be3d28d4b57d203651efd46612 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.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index b8db662c7715a..16e5da6b281d5 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.12.1
+version=1.13.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8
From d9a718fc4b2c68af607d8780df3e661b9aff7952 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 f20b53b73211c..358f81b03d780 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=4
+revision=5
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 9b5379ed49f91c2f0d4a4c8031f209c9ba4b19d0 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 787d2c2869475390f143e6cb13dd11a6ca252129 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 a8d41c6dcb2e5543b3078d2c5db78aa65f98a373 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 d28e0d51a3b4f..528cdb554a55c 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.1
-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 d61b98fbc4bfddfe146a21652c37d61bdcd8590f 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 10b8eb717c8190b4ffa2378b7ae0380b68b345f0 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 80f1bf86da74b0b2b6bba85b04b8c09c10136b78 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 cdd137fe6f3c138218c8d7142723a7bc574efd70 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 c9db493cc55e1..3a4caeccf8bb8 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=3
+revision=4
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 3f22acb41ce37e72701a5ac3fbb1c86ead0636a5 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 951d8d17c08987741f47130073d9430192966cee 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 ee27d04171d85..9f0bdb3a8c1e5 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 6ee4416feeec6e15ede93d9bdcf5eca82d430674 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 b182fd9c7c717cbc49d6f8033974ff5e515e7034 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 11cff69fe7fb9..a85de84f5dd0d 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=4
+revision=5
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 7c0498c875834c0fc34b2e74e29f249777f1cb17 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 96ec351d545d9..f95edc7951495 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -61,3 +61,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1
# onig-sys
export RUSTONIG_SYSTEM_LIBONIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 05d271f0cb6a9e00ffb185a719466a9e83125bb5 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 d5213857e7e92..dc99074321c7f 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.72.0
-revision=1
+revision=2
_cargo_revision=0.73.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From f45c094647ad146664bae46f8b2f9be3d7d02200 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/bump-git2.patch | 4 ++--
srcpkgs/bat/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
index 842b57d4ee6b3..46da66839ecf8 100644
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -1,5 +1,5 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 44460e0..78dfbde 100644
+index 44460e0..794fc50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
@@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644
[dependencies.git2]
-version = "0.16"
-+version = "0.17"
++version = "0.18"
optional = true
default-features = false
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..f958366692acf 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=2
+revision=3
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_patch() {
- cargo update --package git2@0.16.1 --precise 0.17.2
+ cargo update --package git2@0.16.1 --precise 0.18.1
}
pre_build() {
From 80e9e431bc7359093f64e86d80b29c53eada99c5 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 2ee4946aae15c..160ca460f15a4 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.1.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From fc3d493cdf26dab053e4e0cce31d62051d4c762a 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 35a706ff3a14237aefcaa0b1c4d01926ec211dfd 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 cf837b9ec2bb7fbd8fa4b54ad41cd54fe737d573 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 694492c816796..bce9086ead006 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.14.0
-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=00932e1c81e761490e45d16902356d8e6ae7efe4accc0a41e18c342424167f47
-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 97c95e0bf7fcdefea93505600f83fbe58f17334e 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 ed82d41d17b569816d64d46a8c90ffa2dacc38d9 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 4182ce11379d1..b9cbcf9be10da 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.3.1
-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=909b652939299040ebbd15994d710aff7e38fa38683bb5111dd46cc4ed454b43
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 84c3114ef0edb8da7ccf9f36668ea4c0fa844c0c 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 767c524437f7a603c2c18057dab06df66c2d244a 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 209c0c5ba0f2b7d126b08715f637ba7a82c0edf8 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (3 preceding siblings ...)
2023-10-05 16:15 ` tranzystorek-io
@ 2023-11-26 15:47 ` tranzystorekk
2023-12-01 5:33 ` icp1994
` (29 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2023-11-26 15:47 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (4 preceding siblings ...)
2023-11-26 15:47 ` tranzystorekk
@ 2023-12-01 5:33 ` icp1994
2023-12-01 12:54 ` [PR PATCH] [Updated] " tranzystorekk
` (28 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: icp1994 @ 2023-12-01 5:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1835493247
Comment:
What are the blockers here? Is it still `cargo-edit` & `cargo-outdated`?
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (5 preceding siblings ...)
2023-12-01 5:33 ` icp1994
@ 2023-12-01 12:54 ` tranzystorekk
2023-12-01 13:14 ` tranzystorekk
` (27 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2023-12-01 12:54 UTC (permalink / raw)
To: ml
[-- 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: 32042 bytes --]
From ef822798688af7d299a8fd9f9569f2aba165067e 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 89abe2078850928f3c19cfb17fc726245a2939c7 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 db42facbc77fef2faf7164f98a76ce8b95b5dd6e 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 c5372fab197051f9e1e1d7e583c570e5cd86cecf 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 3183295b550a9d0793c8279040fbd459ed6ea252 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 36f3fdf643c65136e0114de80c23cc3ffbcc9e71 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 9874831fe278398db6f3becd75f50a29a3cb797b 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 0014b113601d8f840846422e8c1451e051d18dcf 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 9e9f02fcc23f7717cfcc5448a49cb8149623ff21 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 379014ba70ec353389e3be0406b5f4a323297345 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 286b4b9d7eccc0f52f127de39d5b5af8735e2d11 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 9b6c6d3631c32b56c68332e1f9a1327a00cbd43f 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 14306299237a45998de1b7719fb3f6537b24ae05 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 ff32a3039bf6be23978b5d17501895fac8d8c7e6 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 c761f51b0fcb932647e520ddaba838b37137d65d 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 460aad6a12e12..c906a89f99547 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -67,3 +67,6 @@ export RUSTONIG_SYSTEM_LIBONIG=1
# libsqlite3-sys
export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 6d678319625a78f018aac62bb8e4c11696d61827 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/26] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index ace10e7702981..0000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index cc0cb9a..f6de424 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1006,11 +1006,11 @@ dependencies = [
-
- [[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",
-@@ -1021,9 +1021,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
- [[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 4403044..1d50590 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] }
--git2 = "0.18.0"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.10.0"
- jobserver = "0.1.26"
- lazycell = "1.3.0"
- libc = "0.2.148"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.0"
- memchr = "2.6.2"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 208c18818d570..b6b1154e2d8bd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.74.0
-revision=1
+revision=2
_cargo_revision=0.75.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From c58819b14462f70ced81adbe388bbc0b074998d4 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 7a0662741d6b7b81a75c87e8764fb64e39e99d98 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 eae21c1d82bc755c6b26ca2994e68846bde24f3e 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 a3b8c54180da5992ee6825291bceb2f49b9c6bca 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 bcb51acffd713c4e7a737fd6a69f8a3de0304f94 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 355035b74e40e..932db4fe4609d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.16.1
-revision=2
+revision=3
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 a02c534fc96e2a01fa570dd50636753f9c7c1610 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/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df05..0000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8d..863e443c255ce 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 81ad533ddcca923e69555107515b413f92c1f9df 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 9375dc9acfed01c77d2d2f42e4a4a694f9b0eb03 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 3310003f45f32b9393b9790a605fd923704d523d 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 c1a81e2299268eaaefdbb40693f7103d052c1f34 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (6 preceding siblings ...)
2023-12-01 12:54 ` [PR PATCH] [Updated] " tranzystorekk
@ 2023-12-01 13:14 ` tranzystorekk
2023-12-01 16:32 ` tranzystorekk
` (26 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2023-12-01 13:14 UTC (permalink / raw)
To: ml
[-- 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: 32970 bytes --]
From 479653833eeae447377b2f577e76c7e4e75b4226 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 d4ab598d71f235ae56b33a356f4d8195f30861e2 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.3
---
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..34d2aef692020 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 18a2eb9cd0fcdc9ab4bfedfaf284ccf1d588c9fe 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 c4d16aeedfe9d73ff74e6c438763b6aa54063a81 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 f8e27e241e7378d66eef9f00b2155d2dae7ef89d 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 273993159edc94395ac4c55dc007a1f91d73b73e 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 c141898494e206406f3f6ff9abdfa28d8ba03ed1 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 0fa0d0cace6d3469d9cd7536eba7495e1ec36dce 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 68f1ab800c2a41f9de7bfab9714447981f7eb44b 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 107393ade188852d34aaf717cb40e6f9aaf3b95e 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 34cb4edc3a6ac6f433c12febb6d37e53c665616e 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 ac6a92da3c077e193d4eec5ded7d08e2001cc8f1 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 918efde1bdd5f0eded7cad7028208dc536c3807c 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 80fbc8c9845af9c2f20d627f73e6d6619da8e188 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 997759021e7fc513c96b6d1ba394fca65a013e2c 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 460aad6a12e12..c906a89f99547 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -67,3 +67,6 @@ export RUSTONIG_SYSTEM_LIBONIG=1
# libsqlite3-sys
export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 50abe4e86372258674faee14d493ffd859c438ad Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/26] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index ace10e7702981..0000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index cc0cb9a..f6de424 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1006,11 +1006,11 @@ dependencies = [
-
- [[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",
-@@ -1021,9 +1021,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2003,9 +2003,9 @@ checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
- [[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 4403044..1d50590 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] }
--git2 = "0.18.0"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.10.0"
- jobserver = "0.1.26"
- lazycell = "1.3.0"
- libc = "0.2.148"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.0"
- memchr = "2.6.2"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 208c18818d570..b6b1154e2d8bd 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.74.0
-revision=1
+revision=2
_cargo_revision=0.75.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From d9053a27827d1875a2b53796e9ee2bb4dea43bdf 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 730628c4c349401375fa62cb4849c7f19aef40ff 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 7ef774dc378d8369d1e15535f6ef95fbd80e33b8 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/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df0..0000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a0231..bba0f594098bd 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 05f9f720aa5c5e1210c7e6185c334bad573acc94 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 85257bbffe44bb82429d0ad59bf2085ff9cae44a 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 355035b74e40e..932db4fe4609d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.16.1
-revision=2
+revision=3
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 1b5d8db03d4531a49333ba04e0a49438c94b2036 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/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df05..0000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8d..863e443c255ce 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 9cb0417131c3308602b90a6747b93a2f6ef659ba 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 65143cc04986d99f5350aa8e752a369b9db23235 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 0593100820bedeaee92efa59d312b8a13a9ce7eb 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 88c2ea4d0828299d3ca5922d9a0728576f3f34bd 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (7 preceding siblings ...)
2023-12-01 13:14 ` tranzystorekk
@ 2023-12-01 16:32 ` tranzystorekk
2024-02-07 12:15 ` [PR PATCH] [Updated] " tranzystorekk
` (25 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2023-12-01 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1836425536
Comment:
> What are the blockers here? Is it still `cargo-edit` & `cargo-outdated`?
Yeah, those two are real PITAs with the way they grab the whole `cargo`/`crates` crates as deps, those can't be easily patched up and I haven't had much time to sit down and think up a workaround.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.1
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (8 preceding siblings ...)
2023-12-01 16:32 ` tranzystorekk
@ 2024-02-07 12:15 ` tranzystorekk
2024-02-07 12:32 ` [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2 tranzystorekk
` (24 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-07 12:15 UTC (permalink / raw)
To: ml
[-- 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: 32969 bytes --]
From 299f46e3cfdfee27ad4fc16949066835fa27b194 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.2
---
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 61e838157b2ab..22b58806cddf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1327,7 +1327,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.2_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..5c4e1a48a75c7 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.2
+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=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From feb6c2dcc025fbf0522cfe1ee8411a7e1f0615e4 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.3
---
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..34d2aef692020 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From b7ebd5f695a2c3776ceacae900431b7b209fc281 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 a2246013748dc0ad8bd0481e1f1c876a9e1e312e 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 421700baadd3c..bb226c8b1a95e 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 3ff41469e02780c893dd5bf755071e5f39ced4c9 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 fc72725f5ceda0bb505de17c1905cff1fe46d788 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 2a885a0d22b50..fe12f1242995c 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-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 4f8aa4694ded93e2796b13f82c64760b2ac5889f 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 489dad7087ae5b1d5ead1413abc2cf6f9c40bcf9 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 47d681f66d75b..16bbf70822d67 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 1bf7b7f9834d255552f27b5a5a69e14ec354eabd 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 3b9089a889ffb399d9984c601692b325b85ee6a7 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 4d5c5945cb772e723a9860d8f6639770319dcd78 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 46dc051b04f0fe92b897ae32ce2b5f72f0a12a73 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 c72a891217b3bc76a1c2efefdc658e9d83f4a261 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 a6b8362f9743dab5a1f4cea654d1f6de75389ecb 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 4eb4a7d2df723266e274e123f7903d4d8ef39b3b 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 22bfd980ba9e3..df064355f7e00 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 48914346813393a45b9bb8d366c9efe5661c886f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/26] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index 89002151bf348..0000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a2d339b..6cdf579 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -995,11 +995,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1010,9 +1010,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[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 3fb36b4..ed19d0d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.11.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.149"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 99195fe824eae..3848701de6d24 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
-revision=1
+revision=2
_cargo_revision=0.76.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 0901944d56e01af2d0a86c7feacedcc079023aaf 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 d12d6cdf9d5cba742aef0afc1270cd7c9c62d4e4 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 81758c9d9e0ff17803530398526df684aaa96cd0 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/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df0..0000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a0231..bba0f594098bd 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From e6abd1bde8adeae06fbaf829250a248b81af7767 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 8c2880bf26a4cb8f8c479cff869358798730b524 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 7fc570a911e39..17a2e68052750 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.0
-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=50f6187fa10eb7d2405477ed2b4dfbda7e51d3746b3660664f39b50d74c856a1
-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 d321ee2a77ecb8318fa65a622528d64c08b9517d 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/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df05..0000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8d..863e443c255ce 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From a3f6dde243a8e6d49a06f9ec4769120179d31043 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 560fad25b87551880076acea60de9e266ec0c2ee 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 22c882e968c2a40b894e4c924cfb604ca7aa3cb7 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 ea2b70b978e110ab92ffb057a3d4ec57e4b8bbd1 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (9 preceding siblings ...)
2024-02-07 12:15 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-02-07 12:32 ` tranzystorekk
2024-02-12 14:05 ` leahneukirchen
` (23 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-07 12:32 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 34133 bytes --]
From 299f46e3cfdfee27ad4fc16949066835fa27b194 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/27] libgit2: update to 1.7.2
---
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 61e838157b2abf..22b58806cddf17 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1327,7 +1327,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.2_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 8d24809f244a1d..00000000000000
--- 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 035b2cebae8213..5c4e1a48a75c7c 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.2
+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=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From feb6c2dcc025fbf0522cfe1ee8411a7e1f0615e4 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From b7ebd5f695a2c3776ceacae900431b7b209fc281 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/27] 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 358f81b03d7802..63919df2ca93f2 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 a2246013748dc0ad8bd0481e1f1c876a9e1e312e 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 3ff41469e02780c893dd5bf755071e5f39ced4c9 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/27] 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 4cb46446638003..cac95cb09f1d02 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 999684216774b86792ca18554a095049cddf79d0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 06/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index a577da2a79ce81..54a41121de6f89 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.13.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=f4e2be834cf9ea966ac58451298c8f1eed145c190fbca62b5b5a6bd145ac997e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.1"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 8dcea2de3bb742618a73a8fdb73a2c76c2ba070e 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 07/27] 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 2a885a0d22b509..fe12f1242995c0 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-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 6dfd9d691091aa7c96129063da171a23159370b1 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 08/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 0d9aa1984afa10e8f5613db78cf2077a164f927b 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 09/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From e9a94353f1ae9b9437eaff903432d48cf86a3713 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 10/27] 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 5bdc29d7ff7007..74191baecb95ba 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 aaf01041d9198537fab6826cbb4a5f2efb97d285 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 11/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 41c6803f6f39db88a1a7310d41d3ba1facd709cd 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 12/27] 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 77982f8185be23..5614d4aa82eb03 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 0c9414fe9c4b7dc5a736c7b66aa48cea1cb6ddde 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 13/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 445268dc3cbde633090992928619673bed7fc30c 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 14/27] 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 f0bb0b04ed80b8..fec1cd543ac62e 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 f2d5bb30069632f9f28022f046e0dcf3ef129260 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 15/27] 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 a85de84f5dd0dc..45b89ab3bb1594 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 06266f140f1c0b686c73b3f96bb600fba9c60402 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 16/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 19fa031e01e1f40784d621a13a3eb8e5d11af44d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 17/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index 89002151bf3489..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a2d339b..6cdf579 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -995,11 +995,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1010,9 +1010,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[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 3fb36b4..ed19d0d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.11.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.149"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 99195fe824eae6..3848701de6d244 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
-revision=1
+revision=2
_cargo_revision=0.76.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From c32b5786a613fb41893c5502fe842569564a16fe 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 18/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 0ee4be1034dcfe78689459ebbc6c451b0702e8fe 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 19/27] 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 95abc2f1a94d73..c318b07004df98 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 d60d897451b7d524d42b467b1ac4a53eb58441b2 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 20/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 33857c63b9de3fbe7c52c211a346dd9308720ef6 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 21/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 e91026bc315f4edab91ca2bacd5497dd7f011029 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 22/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 7fc570a911e39c..17a2e68052750d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.0
-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=50f6187fa10eb7d2405477ed2b4dfbda7e51d3746b3660664f39b50d74c856a1
-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 9c114a0c3fe5ce3988d170b4dd67fc95fbad3135 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 23/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 12bea401ce295b4fe8c9908d5e662c7ce1556a34 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 24/27] 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 eda09bc98e9e91..00000000000000
--- 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 d42b45d8815623..4ef4320a9ad954 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 d5a5da6c26ca24276af77c4f33570a5cc1ce79fb 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 25/27] 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 fe5e461fcbf250..af9a680b13acdc 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 343bd5c1ab13f317b4185817aacd249075ddbb61 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 26/27] 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 00000000000000..905f593d6e96e9
--- /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 8a04297c2871d8..5a90f553b775cc 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 5a4c5818b6414417d1883f106ea4e09731223975 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (10 preceding siblings ...)
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
` (22 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: leahneukirchen @ 2024-02-12 14:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1938744415
Comment:
And these things break when we update the cargo inside them too?
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (11 preceding siblings ...)
2024-02-12 14:05 ` leahneukirchen
@ 2024-02-12 14:35 ` tranzystorekk
2024-02-12 16:07 ` leahneukirchen
` (21 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-12 14:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 685 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1938795648
Comment:
I'd have to revisit the whole topic, but in a glance:
- `cargo-edit`: uses git2 as both a regular dependency and a transitive dependency of `cargo-test-support` (pinned to a git commit) and `crates-index` (versioned, but in the package at 0.19 while there have been giant leaps to 1.x and 2.x that most probably cannot be easily bumped to)
- `cargo-outdated`: v0.14 uses git2 as a transitive dependency of `git2-curl` and `cargo`, both versioned so it should be easier, but I'm not sure how compatible `cargo` is between its versions
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (12 preceding siblings ...)
2024-02-12 14:35 ` tranzystorekk
@ 2024-02-12 16:07 ` leahneukirchen
2024-02-12 16:09 ` leahneukirchen
` (20 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: leahneukirchen @ 2024-02-12 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1938999385
Comment:
Alternatively, one could let those two packages use the vendored version instead of holding everything back...
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (13 preceding siblings ...)
2024-02-12 16:07 ` leahneukirchen
@ 2024-02-12 16:09 ` leahneukirchen
2024-02-12 16:40 ` tranzystorekk
` (19 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: leahneukirchen @ 2024-02-12 16:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1939005772
Comment:
FTR, Arch seems to build those packages without issues with libgit 1.7.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (14 preceding siblings ...)
2024-02-12 16:09 ` leahneukirchen
@ 2024-02-12 16:40 ` tranzystorekk
2024-02-12 17:30 ` [PR PATCH] [Updated] " tranzystorekk
` (18 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-12 16:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/45976#issuecomment-1939116030
Comment:
> FTR, Arch seems to build those packages without issues with libgit 1.7.
I did a quick check and apparently these packages depend on libgit2 in name only, ldd shows they're not dynlinked to it
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (15 preceding siblings ...)
2024-02-12 16:40 ` tranzystorekk
@ 2024-02-12 17:30 ` tranzystorekk
2024-02-17 13:08 ` tranzystorekk
` (17 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-12 17:30 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 33854 bytes --]
From 6470d6e62b6e49460a8186ce09932dc69f02ebeb 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 93fb4b26087297..9963a6c1d5c7b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1331,7 +1331,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 94627dbf2efbecb3766babc77f45754912fa9e45 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 002701cb75ca4daeeebc13b44983fb96f8c30606 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/27] 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 358f81b03d7802..63919df2ca93f2 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 8c525aa5a57c5bd1543c18a4fcb6df42f0b0e7a6 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From b98edcc2f9016b16d0c74c89e5c922e463662c13 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 34d9b2ae3a446c47b8cb280a56e5f3488b26d50c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 06/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 4d4dd1da8cc16fc227688484c69b94a2a6268c67 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 07/27] 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 2a885a0d22b509..fe12f1242995c0 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-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 c56a3511f82c20ea695f820840c055bf74e238da 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 08/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 d15304b70698df722441c92573bbcefd411c9b71 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 09/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From dd0d24f5892af682cbd25d4e9a29ba3a1830be94 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 10/27] 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 5bdc29d7ff7007..74191baecb95ba 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 02f2e8710ce0caf1c5d684cad2c931ce60745998 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 11/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 beb25de8bb120f8255b7468668d58f0a6bb612a8 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 12/27] 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 77982f8185be23..5614d4aa82eb03 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 ea377ea9cfb3b27857a5dff38a33bdf86abc3846 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 13/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 d4eb52ebc67768f1c215195c9d77c0a7a5db8770 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 14/27] 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 f0bb0b04ed80b8..fec1cd543ac62e 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 2c230f3e93c9162bae7bced8fbe6060432f6f5f4 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 15/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 022af8c7ef49f6503fd050087113716cc1799bf5 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 16/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 5c06efd2ec85bad7c4774f618e2cb05e96a91b9a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 17/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index 89002151bf3489..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a2d339b..6cdf579 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -995,11 +995,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1010,9 +1010,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[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 3fb36b4..ed19d0d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.11.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.149"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 99195fe824eae6..3848701de6d244 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
-revision=1
+revision=2
_cargo_revision=0.76.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 9f1c6d1aa414d4ab854562e5c884d3f4b667fab3 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 18/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 d653c4f3bd96a448a0765937d81b50c71586cafd 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 19/27] 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 95abc2f1a94d73..c318b07004df98 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 62e07179df6207f5e38c8fd9cce35a5523142434 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 20/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 86d945b577963531e90a9d1652156f57281902ca 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 21/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 f4c34ae8e7c1861d14ecc30a053bfd8b7ed9191e 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 22/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 9378e934467cd1..bc75c3369c5bdc 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.2
-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=d2fcde456b04c8aebe72fcd9a3f73feca58dc5de1f1edf40de9387c211dbba8a
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 03530e7dddfccae418a8acbb54daca15d5e519c0 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 23/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From bb13ca606948964742dfd02de0e3505909ee9d86 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 24/27] 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 eda09bc98e9e91..00000000000000
--- 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 d42b45d8815623..4ef4320a9ad954 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 cfaf6ebbd9bf8fd6453adbb2aad88486345cc98d 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 25/27] 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 fe5e461fcbf250..af9a680b13acdc 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 4b5468caf6f1c26b3bd4bf4f2a32d0deb479ca21 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 26/27] 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 00000000000000..905f593d6e96e9
--- /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 8a04297c2871d8..5a90f553b775cc 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 0eb5d6d7b522a02417458cf6a88ee915e4526c4a 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (16 preceding siblings ...)
2024-02-12 17:30 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-02-17 13:08 ` tranzystorekk
2024-02-20 17:03 ` tranzystorekk
` (16 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-17 13:08 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 33778 bytes --]
From c9c2b27ff984f15fae936196f87f3bc0a98c91a8 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..38814c2f082d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 934338ef7b896..5c4e1a48a75c7 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 624cd01a9789fbe9a41cfc30ba7a555f7906547b 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/27] python3-pygit2: update to 1.13.3
---
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..34d2aef692020 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 0b1f119eaf7cfb512fec46aec39314f782550dac 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/27] 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 cd48f8ad213e82aee111b9019c8bd9d88778c3b7 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/27] 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 421700baadd3c..bb226c8b1a95e 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From fe2c96fab0657ac161808e68d760d1689b36b7d6 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef3..685e332af9ee2 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 a0582af01d206eb1e34ff5cb466b1584e85758cc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 06/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f..0d233c2207906 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From c4de64f34626dacdd6917cff288d6543d71e1df1 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 07/27] 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 2a885a0d22b50..fe12f1242995c 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-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 c72067dd823a134da35c2f6249f1e4d5753ce994 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 08/27] 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 27569bd906b16ba2c242748c04e645ac964655d0 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 09/27] 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 47d681f66d75b..16bbf70822d67 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 242f179351192dc57f580fbdd4f099f945174f3e 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 10/27] 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 4ba2cc7c9b79702626c7064c60681beaf96a46d7 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 11/27] 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 17ad3b5a52b38d5bb6f2cffcd7fda07d2092881c 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 12/27] 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 7f8c4173adfd292ba63f157f01ab10e8a6a4c36f 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 13/27] 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 6665b4f75374f6ba2e28cbc884711fbea195df61 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 14/27] 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 65dab4c48dab3885e0f650246e48dae3d6e4297a 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 15/27] 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 d96f503b458cb..d32564d9b556a 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From d3948d90efdc60eee1c7dfe78ec62988fa3afa95 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 16/27] 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 22bfd980ba9e3..df064355f7e00 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 2935a625fa8f9d3f055f5f7879ed25a6a2333669 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 17/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index 89002151bf348..0000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a2d339b..6cdf579 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -995,11 +995,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1010,9 +1010,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[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 3fb36b4..ed19d0d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.11.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.149"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 99195fe824eae..3848701de6d24 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
-revision=1
+revision=2
_cargo_revision=0.76.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 5d88e0faec210c014d3cdd6f6144532207b604dd 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 18/27] 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 426551350b19c21e2bfb560114ca88e8d66420d2 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 19/27] 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 3c62c130664a5a45cb5864f7edd6730bd9ff436a 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 20/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df0..0000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a0231..bba0f594098bd 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From c1b0ca7112dcf7d4f645ccfd6ee825e0d7ed006f 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 21/27] 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 2e43388d26ae2678d6a75ec076900c0062c4f143 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 22/27] 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 5c6fc2c30fb29..d4f534c09bbff 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.3
-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=0fccd2751568715d708106a23b570201298c2347a360afc522d7029b432f5206
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 078b7db6bc58b3201d93ee9b763700231a893807 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 23/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df05..0000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8d..863e443c255ce 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 2c472482659c9aab4ea3cb9c02bdfaee0834b611 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 24/27] 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 7c6d808a04e200cb2bd497c284d7a16960e3e363 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 25/27] 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 642b2975b07470095603c6b17a1d15c3f3993f4a 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 26/27] 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 298faf425fdc995ca59bd4a8db3bc2a124746757 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 27/27] 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (17 preceding siblings ...)
2024-02-17 13:08 ` tranzystorekk
@ 2024-02-20 17:03 ` tranzystorekk
2024-02-24 11:15 ` tranzystorekk
` (15 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-20 17:03 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 33882 bytes --]
From 691ad629062a9ebcaffe0d00ea9c3166ed2a1a17 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 34596bac98f4b5..9630d71fe283fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 28d67343decaaca3efc7d2fef9566288276f75e0 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From fbe676dc50f04102d1689361d1eaeb4580c350c6 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/27] 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 358f81b03d7802..63919df2ca93f2 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 1389273bcaf76d5e6852910ab3b1d62fd1f3e677 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From b24e6f137a8cc9b4b6fea39b470817f350150798 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 cc6051ee2b0c2646a84edbad331c05e828e3566e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 06/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 52a172fe8e90a23ff4cc04a96c842ae36cae07e9 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 07/27] 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 2a885a0d22b509..fe12f1242995c0 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-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 daf00f73120ac92bf632d436080bfba714237cf7 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 08/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 a65bee31eb0898fbd45584bb44c83b2942a2ba58 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 09/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From df3a59e66db6b24fbc87c76a0127118bb7b3c959 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 10/27] 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 5bdc29d7ff7007..74191baecb95ba 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 96a6d5f7742676c302025e7652545ba7b8dcbcb1 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 11/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 d955f91a6a16b67c1658370b76302acd018ae072 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 12/27] 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 77982f8185be23..5614d4aa82eb03 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 b50e21d85f0aa26100b02c5ecd0690e8e41f3464 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 13/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 6f95825c7ea06379be95f2233a55f62f827f74fd 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 14/27] 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 f0bb0b04ed80b8..fec1cd543ac62e 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 f30159a7cc95bec2dd749aeec2d09279b486a058 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 15/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 8ea2667b1c88a15031602ed07062bc2088dcc17b 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 16/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From d368e64a18a2b45aa0a94ed2909830ea3bcfdbab Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 17/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index 89002151bf3489..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index a2d339b..6cdf579 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -995,11 +995,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1010,9 +1010,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2021,9 +2021,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[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 3fb36b4..ed19d0d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.11.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.149"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 99195fe824eae6..3848701de6d244 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.75.0
-revision=1
+revision=2
_cargo_revision=0.76.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 5c4061f8a6b2a14d84d8dd16d7b7e097e6730332 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 18/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 907f188e877a1e103a51652da01b02eec9749cde 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 19/27] 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 95abc2f1a94d73..c318b07004df98 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 8825e8f67316c1d0aa5c816eeafa5ca114508336 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 20/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From ca898cea73fce232cb11c385fc86c669be1fcc6d 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 21/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 595fcb2750a27a71646031dbd03affc24c8f047a 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 22/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 5c6fc2c30fb293..d4f534c09bbff4 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.3
-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=0fccd2751568715d708106a23b570201298c2347a360afc522d7029b432f5206
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 9c15ba8a28e4c6c5540b0965d1cd36fb677f17ae 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 23/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 1be612df1475c862aab6c09f2ef9cfd45e23e4bd 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 24/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index ba1241984e6b26..6a24bfa927b626 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.0.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=ab29fbda532bec2a344d99f39b7998063c576efee92a1bee083c6fba5f52e4ef
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 70b21846d65e0ee0adbd9fb49e386e04a9cd04e4 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 25/27] 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 fe5e461fcbf250..af9a680b13acdc 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 c128d0482efc7d94a5b3daecf2b24bf57455c7f5 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 26/27] 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 00000000000000..905f593d6e96e9
--- /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 8a04297c2871d8..5a90f553b775cc 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 6da6455d0261c70c666fc8a4f7f5b3591e9e7966 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (18 preceding siblings ...)
2024-02-20 17:03 ` tranzystorekk
@ 2024-02-24 11:15 ` tranzystorekk
2024-02-24 11:17 ` tranzystorekk
` (14 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-24 11:15 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 33898 bytes --]
From 1fac2b148db681e6cce1f4455a6846be07168ece 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbeff..cdce618da59286 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 8872fde66e7ddf5ca9d9dff5335187db30ffa486 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 5bd2bbdfbb31c0a859dfcb83cc48a1c82bb8c9b0 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/27] 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 358f81b03d7802..63919df2ca93f2 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 70421dd389fb1c65c7f93d8a177fe90c2c7a85b5 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From a7725fa902039480caddd3e0b25662653f6cb2da 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 5cc4d623712a14c42ef0419072f02a1caef76b36 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 06/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 51c2f757ba745f7b427bc95f89f4a16b3764691e 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 07/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 5ff062854ea673ece7b4a1e46b976a09b6720312 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 08/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 26456cfc05c3a71fcee66404270fbd3c8d16060b 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 09/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 8b916ee609fadfe6f8dfbfda7c1797203bcc2633 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 10/27] 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 5bdc29d7ff7007..74191baecb95ba 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 d6d911e3860cabf14dd4f52d5f09ddbde158999b 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 11/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 d4be79772a8c063b893ef50f697e25b1673dba50 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 12/27] 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 77982f8185be23..5614d4aa82eb03 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 c1fbae2511ec9019fa35c79cd78a90aad3ffa7db 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 13/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 d0c760b13e2de5f995ed0a2fdacf5ddd6c5c9f3c 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 14/27] 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 f0bb0b04ed80b8..fec1cd543ac62e 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 6345faed517b09ac081b7fda6a80fba768f4c0b0 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 15/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 5bb2bce05d28b405aafcf590d837b43a7610ce01 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 16/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From e622cf25981377b894aa033debc576bb9fbc6345 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 17/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 74a57ee28b713228f5a121a3df73ccf55570d94f 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 18/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 3fd839c82a059781bce5a914a49eed9ae720def7 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 19/27] 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 95abc2f1a94d73..c318b07004df98 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 68bf6d3f1b25847664231dc22d38e35a61124140 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 20/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 238c4b20391370bb376138fafd37c192b097347e 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 21/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 b8c0a36a72a6470d673c53d1c40aefcba52964b1 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 22/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 26281bc0d392dc..f6b7de427a707a 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.4
-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=2200bc1c07511c105961dcb3fe1682cc9067d55280dac990de7623aff86cab1a
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 3dedefe2746b29b91452887d351891a9973d1a0a 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 23/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 81d23fc9182689ed5ead4a214f037f64e8813705 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 24/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index ba1241984e6b26..6a24bfa927b626 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.0.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=ab29fbda532bec2a344d99f39b7998063c576efee92a1bee083c6fba5f52e4ef
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From bc06a1a93629b6d556a328f42e9e4d47462530bc 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 25/27] 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 fe5e461fcbf250..af9a680b13acdc 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 4ef4d9bca47ba884887c29bfa771064329e52b76 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 26/27] 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 00000000000000..905f593d6e96e9
--- /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 8a04297c2871d8..5a90f553b775cc 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 3f3233d2d6a2f8615a948e1022f88a47666b63ef 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (19 preceding siblings ...)
2024-02-24 11:15 ` tranzystorekk
@ 2024-02-24 11:17 ` tranzystorekk
2024-03-01 14:20 ` tranzystorekk
` (13 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-02-24 11:17 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 33898 bytes --]
From 1fac2b148db681e6cce1f4455a6846be07168ece 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index cde1106f7dbeff..cdce618da59286 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 8872fde66e7ddf5ca9d9dff5335187db30ffa486 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 5bd2bbdfbb31c0a859dfcb83cc48a1c82bb8c9b0 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/27] 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 358f81b03d7802..63919df2ca93f2 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 70421dd389fb1c65c7f93d8a177fe90c2c7a85b5 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From a7725fa902039480caddd3e0b25662653f6cb2da 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 5b9c21ec738fc9f11927d222761a73ee49653deb 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From eea64038b7b602b83b51e1693910e33aae6a1850 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 b7110d7dd6cbf77d0798ce42893e1ef1b0c7d00f 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 11dd9c6ebaec7346b96bf882d3b80c66c8315dcd 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 e47a4885414dbec0bdfc015731f9b075df9c04a4 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 a642d86637c22258976edbfa849529072de960d2 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/27] 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 77982f8185be23..5614d4aa82eb03 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 34e975b17f7156284de908668142bcfa8dac6742 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 a602060593b542c4d5905a352b3bae7bcc64ac43 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/27] 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 f0bb0b04ed80b8..fec1cd543ac62e 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 a4a26b77b5c72b17c74b1a76d2f179cdaa3fed44 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/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 0c72944dee3d1ac377cbf032482c6818256247aa 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From fc892231b6ef648f8dafc1b0b33a2f258e490b67 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 46a7002e23f48d1b49e86ef8828ec10c128dd1b4 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 8b0cf4dd47cc2e7b5008ed09ed32569eb1fb0a9f 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/27] 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 95abc2f1a94d73..c318b07004df98 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 d551d6fbf8220281835e3680db57a73514ba3a4d 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 550fe293bd4bafcea93ffb92801b35b86e133d39 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/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 3e6a56a6d4840be880c2e66bf9a66f2cbceae8de 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 26281bc0d392dc..f6b7de427a707a 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.4
-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=2200bc1c07511c105961dcb3fe1682cc9067d55280dac990de7623aff86cab1a
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 101fd8b0695972af75cff5d1ef47cc0e269ff0b1 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From cf9e5c4f54eacf652a295276da78be11864fb47a 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index ba1241984e6b26..6a24bfa927b626 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.0.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=ab29fbda532bec2a344d99f39b7998063c576efee92a1bee083c6fba5f52e4ef
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 7d8fd1a06438a84c06251049f106183fe3c7e96e 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 5e94a67a8fcfa73a54b6f09f820890964d94bc48 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/27] 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 00000000000000..905f593d6e96e9
--- /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 8a04297c2871d8..5a90f553b775cc 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 9c13e2da01449f902cc8ca4336a1f06527cc56b8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From fb9c641b78073ea00ce45959b916dfd8b7806e58 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (20 preceding siblings ...)
2024-02-24 11:17 ` tranzystorekk
@ 2024-03-01 14:20 ` tranzystorekk
2024-03-01 15:45 ` tranzystorekk
` (12 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-01 14:20 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 32657 bytes --]
From 2b87449ee91c870744b21b37b1425255a91f9de1 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 44c8b34a3482ea..1222650576a221 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 8524e21d39833911a480d0b363d176060d7045ea 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 166230017a306531a03c8d7fb571ad7bbd869419 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/27] 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 358f81b03d7802..63919df2ca93f2 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 f4ac5d2b25f54e8765b007b63095a0fa51cb5856 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 4b61af202f46c0dafb827943a8fbae08c7e564c4 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 855b383c4307b5f1433b400f386467c178c156f3 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 09e103977918f72e243fb56c96264c4b59a65735 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 d500505ef1afcb0efeac0bf25aab1b5a428c5227 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 74d9db7c66dadfaa22738bab8909f2ef107af31e 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 cfc0d831f09f513eaea9e11fbe7b1116762db41a 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 b17624a8573cb0e419a32481cbea61df996ef921 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/27] 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 77982f8185be23..5614d4aa82eb03 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 4eba403fd4cdd560bb293601b59cba9ff4b09008 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 84e12026b90c30c3f344d3eb7a95cba6e18e7e7a 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/27] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From ae424a16cfdbb1ac315c5d7413b79247b0d87943 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/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From fb3e52bda28bbc4935bff8478ba640fe7033ed70 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 334e583c81df9485b44d77b949c5893fd906e7dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From a6ee104dee99289e57f6f6507e536016b091898c 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 5ffb7eea86329da7249e467339e0620af62c5b34 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/27] 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 95abc2f1a94d73..c318b07004df98 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 67d5cbe9642d0c19e4a314a39b4a7c6cab1469d0 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From a0e16dee497050a3614d6a678086452cd8f152b1 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/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 4167bb5610175d73c71e3fb3f1145042daf1196a 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 26281bc0d392dc..f6b7de427a707a 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.4
-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=2200bc1c07511c105961dcb3fe1682cc9067d55280dac990de7623aff86cab1a
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 7d3babe5941d4685b0d7100a4eb421595606f616 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index ae05cdf3a3e8dd..863e443c255ce4 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.11
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=36c3b2c7bcd1d9db5d1dedd02d6b0ac58faaeb6fd50df7ff01f5cf87e5367b52
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 95136237fa0fe7b73a719fb37e0069649c22c6c9 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index ba1241984e6b26..6a24bfa927b626 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.0.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=ab29fbda532bec2a344d99f39b7998063c576efee92a1bee083c6fba5f52e4ef
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From ed636687fa89b7761b81dfed27cf7dee60ede109 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 64cd6de401ec755b976c28de32922c27abd9b210 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/27] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From c1e910c1147bd983a260c4210df553b6e0798e00 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 4b68ba8d8af618d9993a8a1a59a165f01f8f05b0 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (21 preceding siblings ...)
2024-03-01 14:20 ` tranzystorekk
@ 2024-03-01 15:45 ` tranzystorekk
2024-03-18 15:02 ` tranzystorekk
` (11 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-01 15:45 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 32657 bytes --]
From 13e43c01eaa3a4e30704095e2a9bc869b735b2a8 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 44c8b34a3482ea..1222650576a221 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1332,7 +1332,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.2_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From ffe04518d1e1acfd1871aa5aa57454dc33cda6da 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From bf59840fe9b58b2ee283773af2d4d2adc43a4cac 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/27] 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 358f81b03d7802..63919df2ca93f2 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 b159520998104127f0325ac3b694e825e061eaec 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From c01643cbec0e2fd26135adc6e1bd4bbc32a001d3 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 fe3eaf8bc5bcdb83ae0e6ed88e3c78e0c18dc85b 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 1be866e38dbb4e941ab2e6e1fb559004d7d80c29 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 5c6d175663511cbe557286fe2ecaa322f60b9044 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From dac648a4350cb40bcd876c18942c48bfa3e2958a 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 02681f20c6c2ec91ca02046d673146e9a07b0888 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 a04291d942b2b12154cc02b60be87d132694c3e6 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/27] 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 77982f8185be23..5614d4aa82eb03 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 ab6a8440819a88962aa8a83eb79fc866e8d4731a 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 16f8e5e989c91fcd3a00d9550256298ea5d1ac2e 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/27] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 9674b6191aeffd8ceb916f107dc559cb60eb8983 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/27] 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 d96f503b458cb0..d32564d9b556a3 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=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From f1aed142f4a667770c2ee979e44e1a055c19c332 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From b139b4633069a0d8d8da5fcaf212195477dfb876 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From f52c98d5c936e225b4fa1635604eb7c84ffaf714 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 5a9cc4a7ad6d3a41c70aa66818c8e65686fd3d79 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/27] 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 95abc2f1a94d73..c318b07004df98 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 3183eba399876f3b6b3bb8d9496f4c73ee48ab9a 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index 8273f1eb15df04..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index e84724f..9a01b29 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.1", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- anyhow = "^1"
- colored = "^2"
- chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index e0cf7481a02310..bba0f594098bdc 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.0.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=2a0e332b7028ffcfeb113c734b4bf506c34362730e371b03a3e4a71142099330
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 260e0503ba93381a471395e8dff48cf69d71ebe4 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/27] 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 05255c23c9ccbf..c670fe74abb6cd 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 e0e2c44370d7bf..6dbd1cfb88d559 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 6d91b579b6257f1073932a2aa98ae0e6ebc4d566 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 7c919934c1c3d5..739c0646c8fd40 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.5
-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=9229b2111063577a0cb8650db270d0ae6bcc1b437dbacf814786f77c67b1003d
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 69cb17d56ffb9479c8811aa13fef2a3015ade85c 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From bff2073e777a5df218272f0967d5960f38df7ff7 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index ba1241984e6b26..6a24bfa927b626 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.0.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=ab29fbda532bec2a344d99f39b7998063c576efee92a1bee083c6fba5f52e4ef
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From e4971c1354203b4a3ef1f1da3a77c67bb3239564 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 5c5fea30d63b56ee072d0a7bd95ff70d82cb5730 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/27] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From 62749bc3bd9467c8774be69d776cd609feaf0c1c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index f6cff1b93fa2f2..0d233c22079062 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.14.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=33bea9014f53db520d2983830f3da75b7124c44a16b75850a1dd781355aeff5b
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 34553a471cb9e9fe508c9c82d835bd67b9a6ade7 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (22 preceding siblings ...)
2024-03-01 15:45 ` tranzystorekk
@ 2024-03-18 15:02 ` tranzystorekk
2024-03-18 16:55 ` tranzystorekk
` (10 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-18 15:02 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 32735 bytes --]
From a58d547f858fa7436f0b108d68cd3976871d2689 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 ++
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 1b554f23bcfe12..b4f3647e81a70b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1336,6 +1336,8 @@ 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-glib-1.0.so.0 libgit2-glib-1.2.0_1
+libgit2.so.1.7 libgit2-1.7.2_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
libzzipfseeko-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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 68fbf4f8bbac72b897af84f4cd93356a199a2e11 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From ab59d9257154dd7f2100ee65bb0cf8cb6e6a3c39 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/27] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From cd63c1233927d1f1d18d3cf1d5d1ecf2610be00e 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 337b39e916c851c3afac531dc15d98cf49fe1196 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 204ff01d2e21800d0d5a5e5b1638deff9fbb20b0 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From a90eb2943549645edfbd337faccb525466780899 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 19caff301a2b369319cdfdd7a1294f5ccda30a90 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 736604cc11da0f431583d69574ce705dbf389583 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 e6ebc727218fc4f275ef8efc3ebbfbbb037b7251 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 1c43385a4078b039094d2b429241370bce7ff9c0 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/27] 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 77982f8185be23..5614d4aa82eb03 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 9b573f6d6e204420440006616bb65ddc0df7f8f8 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 094ef669ee9f421293f842c00df9801f53e7c2c7 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/27] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 6905e2eb5fffbddb6c2828652ba217eb91015c16 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/27] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 33370e07ff7b88b8571422ed890bdc0a9eb4989d 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From df2a264f2c5fceb4d6bd327381907f8a8cc9336d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 7451b0d846ccffbd42bef4fcd2c2992809ab423a 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 8cf5709d2318607887ec3f567b884d3e9a33a63d 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/27] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 0f3756370b75f268ea26174b9fd37f2fdb317001 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From ee1eacc135b3a80ff74a66bf616d15ba12893fa5 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/27] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 311e22d4901ff2ceb588703c3eb15ec00440f55d 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 ce207b228dc00e..041b96664127dd 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.7
-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=e712e3ae97ca7ee28e411b8537e20b1efb88b3e052c8053c13d70ae97bae9b61
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From c641ecac21ed589b405a2a28e2ba9ef5d6c3bbd1 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From e1e9584907ae1786e44977fdcd63737672a9523a 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From f518f2a79e6a8d352bc81ef8bf337bbc47c95ba6 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 8ba3550d63ce0cbb9ba309e683d92ae40155ba4e 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/27] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From ed603807b7a1ba2b1147fa6d8b9171f78543bd68 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6a79d001de34cd..a26cd77a53cd35 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From e32cff8f0ba631651b6937bde4323898be108883 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (23 preceding siblings ...)
2024-03-18 15:02 ` tranzystorekk
@ 2024-03-18 16:55 ` tranzystorekk
2024-03-20 16:44 ` tranzystorekk
` (9 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-18 16:55 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 32730 bytes --]
From 969da091024c1672333aa9267e60cb9b44944125 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index c39827e7d630a1..69dc940aa66421 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1334,7 +1334,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 599189ff8e3f2cd27eb6edb5b68ddeb30348b7fa 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 3baf657264fea6453290e5c44b8aaf7ff1d409e8 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/27] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From e80f74b5c47675351bcfbd3c119386ae2d36399c 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From fffe2a6fd974cee08cce4ebf55eb131e18a1fb25 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 fa191071040fefe4a16ac106f25c143913ab404e 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 11176bf68a29737e8a5ad93f2968d5525bd97d89 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 22f14675e68d5581783f6acb747e4846dd7323b8 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 4814849ae16f500d19efcce5fe251165e51edf07 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 d66df7d42f4d92fc152d1ff72fe0b3ae8083df7f 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 84779c1397a7f265d265460db5643937c8900641 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/27] 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 77982f8185be23..5614d4aa82eb03 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 91d5b9edaee3b7627547382550639815532bd947 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 28081c01bf9ffa805269d1c85a5878d5cdeb0aaa 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/27] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 882e2c1d1126d275d440b104e69c04e61b43097d 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/27] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 4a1f1040bd062ed4e9c74e063fc7b7aaad72a6c3 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From f2b06691a2e189bd456b3f3278efc44b87b090fc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 58f83e51d7164c4bcdc40e1687e84c3668a4e739 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 889c133023a0edd973ca867fe9c587c0118610af 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/27] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 f4e21368cf222dc97580f1cbc2fd103f95e46a9a 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 0c9edde9c3c8c90540feb9981ddff3ea23be76de 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/27] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From aefb82890ce091027a9bf1b2e3d90cf24e61b5fe 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 ce207b228dc00e..041b96664127dd 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.7
-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=e712e3ae97ca7ee28e411b8537e20b1efb88b3e052c8053c13d70ae97bae9b61
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From d28a756d5015c62c11a1627869897ac4d8882c0a 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From dc84a6c76ff37cc09ec8d67d48d2a9acbe6d5af9 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From ed3ff6b3a004e21c3b1a4e0633e50a0301808501 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 cd6dd29416f8c3aa434e26ffab809c8b1b7f0fc5 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/27] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From 598f31e09525db44e3897cb07c4645b44fb936df Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6a79d001de34cd..a26cd77a53cd35 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From ba386302b6c09f710bc3c66ee137695f48fb1b75 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (24 preceding siblings ...)
2024-03-18 16:55 ` tranzystorekk
@ 2024-03-20 16:44 ` tranzystorekk
2024-03-22 8:44 ` tranzystorekk
` (8 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-20 16:44 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- 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: 32730 bytes --]
From ee9287b436fe9db4dd9eaf8b87213a53a9b74a07 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/27] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index cc85a48ce8f207..84a641f05be8bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1334,7 +1334,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From ad93de7aacb78315fe47d82936dbc9116e0e7a2e 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/27] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From cc6e21eb963f3db5bf1c745df43e8ead13ec8873 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/27] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 1e4048c4843069c285fd1fa7c40114e2f0029a15 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/27] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 4fababef10b1aca267ad692fc82d62ad91dd9bb8 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/27] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 5f47177e74ec4ed369a924a66c2ec560c3b3f659 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/27] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From f0d6c1566aa575627df506e324634390fa987a50 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/27] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 fd6e02617b2366bff9ddf64f99b0fffbf5108db3 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/27] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 6b256b6507cc637a56ea07b6e95acff5dd05df4c 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/27] 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 5bdc29d7ff7007..74191baecb95ba 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 fb1cf1f7238b9c8ef53353a3a127052dcd2ed0a3 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/27] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 7512f2819d7d5d7bca9768e768c53ff651055709 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/27] 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 77982f8185be23..5614d4aa82eb03 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 b3b793d98d210f70ec2533c977ed7cf64dea1612 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/27] 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 5bc0ec404d99ac..a12180fa1e788f 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 818087202a7245866aa9aaf7938fb2a66d40876a 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/27] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 0ff4c0c7a2a5bf3ffb6ec1ae4bd209a9a453eda7 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/27] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 935ce1a97e27340aa129bb4cb15b8694ba043647 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/27] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 8eb29d57f01c3857ce32d1f6a6dab9539518fda3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From b740b8c535bf0c8a2905b006d2be49f064b2247f 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/27] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 36e17ce5e1c8f96419f6caa6a6919ddc18c06bd2 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/27] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 831a2bef99a7853f097c1d7a2b4b51e7f602ccfb 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/27] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From d390c1f1d0645ac53cdb6ca93c00b6338b5813c5 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/27] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 147b4b817f0d5fc4abbc4e4b4bf7f78c091367bc 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/27] 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 9f4eb5bee96aa5..00000000000000
--- 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 ce207b228dc00e..041b96664127dd 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.7
-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=e712e3ae97ca7ee28e411b8537e20b1efb88b3e052c8053c13d70ae97bae9b61
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From cce2170c55858d0c38ae60117900768774e940cb 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/27] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 100ef724f2183b76892b3adcc3bbc65ed20990ee 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/27] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From d9f61c4471a504fa44aec67a102cd9c549b276f9 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/27] 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 fe5e461fcbf250..af9a680b13acdc 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 ceb02a0d085ba998d3ac181111dcf11f1efbf204 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/27] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From d348ab07ba6951b13433cfa8ad9678330de88bcf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From e2fafb9650bbcc8398f72dcfdffb68e84abb7a3c 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 27/27] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (25 preceding siblings ...)
2024-03-20 16:44 ` tranzystorekk
@ 2024-03-22 8:44 ` tranzystorekk
2024-03-22 22:24 ` [PR PATCH] [Updated] " tranzystorekk
` (7 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-22 8:44 UTC (permalink / raw)
To: ml
[-- 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.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 34431 bytes --]
From 70900e33703c15bc2bc939a5d9b17f4dfecb34fc 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/29] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 9ca4502a01c4a7..aca729c953aaa4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 880682833ec041432668a98351e624623120cb0d 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/29] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 1e8c3997442b8746d9a448f33244ad7e6e51b7eb 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/29] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From e534ee1a35db61420256b7b8e77684eba37c2bb7 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/29] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 02d0338b6807549ddedfa808fc580d5d33fe28df 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/29] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 e0e0e7157d7f72b8e878f5f6051719a98ad8d176 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/29] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 3e000001100ccc711f11f221b3a3cb1d1e21968a 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/29] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 b8db82e460488ec3249a4e1c890ec1c44a996476 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/29] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 945936c3866fa69f01467e5d202fc495529e7f07 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/29] 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 5bdc29d7ff7007..74191baecb95ba 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 a196b2c3d91d93d8458818432cea11b4758132c4 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/29] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 f8e3b645b97fde8f1b6c5c56b19afcb8d0b8b4b2 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/29] 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 77982f8185be23..5614d4aa82eb03 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 29325cadfae9cc739b621bb8894621dedb3fcaf0 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/29] 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 5bc0ec404d99ac..a12180fa1e788f 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 057da5bd039a0cc7358e27032f3f84ccc8071ea9 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/29] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 82854957410851de961864bf46e466ecf61c68d7 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/29] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 0f116e86d177633dd65aceec076fd224bbf1c857 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/29] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 7de02dd1cc02fb7ac018b6a46121a3c9a746006e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/29] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From e2132b390d71ff6d193285034c7dabdbb64767a3 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/29] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 fbaeb18ca78cd370aa496afbaa4820ddb4d619f1 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/29] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 f627ccc646db0851afad1b1c27363dc5e8f586d1 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/29] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From c5ee94000a3df663390815d2e25041f98ad3cca0 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/29] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 53c7c46745d0b96bc39622a6e8a16982df9c18ce 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/29] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From abae558e51a300a3886f3c8d5a93da9c4d9c741c 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/29] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 74aef6e4ca1e94d58ac46ff4fe04bd98e976350d 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/29] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From ea63711fc51e6974356ea36a3e4f79bc746e91c0 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/29] 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 fe5e461fcbf250..af9a680b13acdc 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 af4d5164fd69f57084487124b0e0c7f17b9242a0 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/29] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From e17ee1093759468f37ea22c5447c4b53b25b5bb4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/29] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 5edfd95aaa91ab16a7761e9844f077ec54288f90 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 27/29] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..34713e80ba6280 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() {
From 3c8690c151d72efb4c8486d657dd652f3c815ce9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 28/29] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 0da1fea83e112c..089d505e98001b 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.21
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=eae4d4641e57ef2eec75d9f76653b8a3a0dc0b91b3dcc8fbbb2ce4456a08fcfe
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 8614cff2ff862db2f145dbad78dc06337c9fddac Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 29/29] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (26 preceding siblings ...)
2024-03-22 8:44 ` tranzystorekk
@ 2024-03-22 22:24 ` tranzystorekk
2024-03-23 6:41 ` tranzystorekk
` (6 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-22 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 34431 bytes --]
From efef0113851d70b02aa9d76977f78a494257bd2f 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/29] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 9ca4502a01c4a7..aca729c953aaa4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 9c94ca58ad56e1a443bff72f569d63e083268b17 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/29] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 90f2d5b89c39acfc0fc18557cf95c4c8867ef239 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/29] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 678caa898c83bc7e8ff8bc4db0ae4e2bc0b60a90 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/29] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 4474a1f67c2c418c471d87781429a144f665a12f 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/29] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 3feb262a3075b5473ad640cc3b7fe9cf628a869a 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/29] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 3811706e7fc6d99075b85a51064bf2d77edf7c1d 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/29] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 928a06395cf1cd5b825d4cfb6c671b6f2ae021f1 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/29] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 91cd0457070f32bba7c09f987454a5a6893dcd4b 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/29] 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 5bdc29d7ff7007..74191baecb95ba 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 a8b40fba82a1288b2e170eba3fae66d797a32ee2 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/29] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 4361a56e223165c4d68073524a2984b7a4f7948a 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/29] 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 77982f8185be23..5614d4aa82eb03 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 7fdccde38deb4b479c058a29788e2029e440c2f1 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/29] 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 5bc0ec404d99ac..a12180fa1e788f 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 1d406230aafaef33862d4b944a8046a93387931f 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/29] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 9d738c921b49dcc8744bf5e4ff208acac4fc016d 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/29] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 15a7d4b1175cee4953e3a284018828ad25080ae2 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/29] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From a810eff231633b88a463515ac04efa3520497c39 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/29] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 8d0897e97018c1d87716e0249fabe055ba862dbb 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/29] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 670205845945ba84f7ee6733ffe545c8664a6dfe 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/29] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 7f33da6b1f596c96375d4c058a2990039ff09f0d 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/29] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 5e2737e20cfa3a0ff8394953f5b7390160be77d0 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/29] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From ae207e3fdd83c8edee771bd6cfb3696171a89a72 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/29] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From c98a3b77ecd6361237e2caa77e7fc90f6d745a07 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/29] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 68bf75ef9ff5e927cbb6843b910f1f4b98c5e516 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/29] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 0c9fc761efc805f3a49e7dfbec8c45afdc369ca7 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/29] 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 fe5e461fcbf250..af9a680b13acdc 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 8e19b9236de403be3edd3cd24b80e68138d16aa3 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/29] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From 57e2cc6ab2aebcac4cd183c0d768a02bd5e2ea33 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/29] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From a07e02ddc639253a927d9b0c5d6846dcb37949df 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 27/29] 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 54319caba11e90..058c4b684cd72f 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 b07f510bff495a..dd07ae0c036341 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.2
}
post_install() {
From 1367edc18bd22288cd6b65374ca289d5ce3bdaab Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 28/29] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 0da1fea83e112c..089d505e98001b 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.21
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=eae4d4641e57ef2eec75d9f76653b8a3a0dc0b91b3dcc8fbbb2ce4456a08fcfe
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 2151048d24417655b3788c92942072edff3085c1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 29/29] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (27 preceding siblings ...)
2024-03-22 22:24 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-03-23 6:41 ` tranzystorekk
2024-03-23 20:56 ` tranzystorekk
` (5 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-23 6:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 34408 bytes --]
From d30b31b20b76dde1a0c5b828640a59a6c84b6d6d 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/29] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 9ca4502a01c4a7..aca729c953aaa4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From ea286f9f015f2733b6a3d0e4ac38df65d63244de 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/29] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 347179fb6b3a07a0dabd17c137a7de8ebd73214a 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/29] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 127a45e6e1df63f6464ad870ce21fcc310a21ce9 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/29] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From f284cae045ab60013fa78a9c083eb5483e3f2e89 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/29] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 024fc8a7b1faeec5e6009a1fbf8592e6fd553704 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/29] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 64ea0b85e60204294e786b67b8eb2fad46d2ce49 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/29] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 0fa419126662d7b9cb2646e73e0bf1a62b7e5a72 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/29] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 388f918646cff8cde89695531771e3ef6b923afd 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/29] 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 5bdc29d7ff7007..74191baecb95ba 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 e622c8b0e51bf66070730092bd8c58bbc8ff9ca4 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/29] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 6db18bd79129dacb34dbbff7994de031011c401a 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/29] 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 77982f8185be23..5614d4aa82eb03 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 536b2ee1c429412e85c2f973df63f8aceb82ba82 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/29] 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 5bc0ec404d99ac..a12180fa1e788f 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 8e28661373ea3ca051da7b03ca92f74435f06216 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/29] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 803829a3ab8e808a9dda13cd9cde8b72faa39931 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/29] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 9343b7d8319a68e2e15875d699caafa5a4746c43 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/29] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 760fff16e9564dd9f31885d0316bd8615cfae472 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/29] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From fc6348419784a5b45987dfb19c798c7f4ac93b21 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/29] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 9acc1850eafc494b7d435f03481197494e200cf7 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/29] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 cd0c4db557d38c624f4dc6fdc8dfcae916421d2d 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/29] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 83be601fd60169de0126d87293c3185985146cdd 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/29] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 4970d4ea4be2e404e556baf32f9cb56c93b68382 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/29] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 5760eb565377c66eac217d3a9ba9e52b2aed4f78 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/29] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 5ef486bdc28ae421c102a57cd247cc4eee484522 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/29] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 1f0cef9bc4edccd303fd5d23f1a3f0b65b9da27c 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/29] 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 fe5e461fcbf250..af9a680b13acdc 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 fa69fe82bd38051070945b3c1a9567913cb6fc8d 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/29] gitui: rebuild for libgit2-1.7
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 0709729a0717d8..cff1c1b41934c8 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.25.1
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl"
hostmakedepends="pkg-config"
From e2bace2a624399e1f80fe5fa33ea8d61b02e9fa3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 26/29] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From c8c2be0b5267146f947d269785e558befcffdc6b 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 27/29] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 5a41bba80a287f..7e79d355094da7 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From 4028e948514af3b4bd426601f626309672e2b02c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 28/29] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 0da1fea83e112c..089d505e98001b 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.21
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=eae4d4641e57ef2eec75d9f76653b8a3a0dc0b91b3dcc8fbbb2ce4456a08fcfe
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From e9861090bd3a221a483ef2f04c859b89b6957bd6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 29/29] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (28 preceding siblings ...)
2024-03-23 6:41 ` tranzystorekk
@ 2024-03-23 20:56 ` tranzystorekk
2024-03-24 12:06 ` tranzystorekk
` (4 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-23 20:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 33701 bytes --]
From 363163bd8bd356e1e7917a287c504c03361ced80 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/28] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..a09b7483e0866c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From af8acdc3d299d65a6ba05370780f5a06ceff8301 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/28] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From edeb029b92c22baef1a288a29164def3ee9fd29b 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/28] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 047b77dcb13030b8657bca5fa47455fe008b70f9 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/28] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 20016bd8fcda02b6ca31819421832532b8e675d1 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/28] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 ab7b8cc68bcd1c327c93776e45eb49fa11194c87 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/28] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 92b237f9b6a243dd3891d4f161642860175b60c0 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/28] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 0e0781254adf6b5402615daa630c211c586b78de 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/28] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 7ed0045f2b6df936cef19bbfab7a23e5ce28a1c0 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/28] 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 5bdc29d7ff7007..74191baecb95ba 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 90ce2f5b68ac3711a923fe83b13903a21ee98e4e 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/28] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 52204833a266c5edb0f5258fdcf0855f809a5bc3 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/28] 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 77982f8185be23..5614d4aa82eb03 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 c0f552624397c45bf83178103e637a0d4affdec5 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/28] 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 5bc0ec404d99ac..a12180fa1e788f 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 01cc9c9ca6f14b9ee7b336c441d0f499f2d9f39d 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/28] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 9df852f6b0d5594eb983bdcf9f8935a1b47b9355 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/28] 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 bb54ba632f495c..04cec19ab234d7 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=45.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 87fafb1eb28acf0c36e12a1ced606755a7bfbb7c 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/28] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From ada2cf5a6c70ce2b8dea53c4fa17a3cfa09d9a85 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/28] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 0650d607c71423c764ddba2965ada44ab22a1d86 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/28] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 27a395b51fa6f9b7e4ab9961bd9436d4caa809b5 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/28] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 b9eea7e40413144caa02e76679e02aa1fe8f6ea1 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/28] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 76940cd39f4dc977e65bb0faf072d41c501f992a 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/28] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 27e4da1c64c6ba9df0da88b5dfce17446f7d0a8f 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/28] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 3d1eeb0be2e11c0d784a6ce96b4c54b2b73786e2 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/28] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From a967b5ecbd96da65b6d2b29a7aa4f0f402586be6 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/28] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 006fa6d0153a4e49665f1bd71c8834c392d8f846 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/28] 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 fe5e461fcbf250..af9a680b13acdc 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 dd8ebbd2828d27108b8b7f8d65bc3811531823b9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 25/28] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 90857862c3afc8be95b9c6e6eb1955da9a1db303 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/28] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 0975fc93b1d550..43c60a44fed78e 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From 4f9dd6562cfaca96853fb6fe79310353662648c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 27/28] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 0da1fea83e112c..089d505e98001b 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.21
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=eae4d4641e57ef2eec75d9f76653b8a3a0dc0b91b3dcc8fbbb2ce4456a08fcfe
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 69de11104ee67fab811d1c5a9e07185ef805bc2f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 28/28] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (29 preceding siblings ...)
2024-03-23 20:56 ` tranzystorekk
@ 2024-03-24 12:06 ` tranzystorekk
2024-03-25 22:49 ` tranzystorekk
` (3 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-24 12:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 33701 bytes --]
From ad86bd6edd0e1924fadb46ca7df9b5a25ea58d46 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/28] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..a09b7483e0866c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 125f4595911af90e0ba25e62ec045bc83fd54a3a 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/28] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 5f385ebd191205c6cecb2b39f4f2c86bddc439b1 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/28] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 700fbcc9a03f4ff685df7bd9f4670c9f98cde9a8 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/28] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 31f331d0e2b095e9cdeca65ca7d26106575cc471 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/28] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 6c524b6a4443c4fe9cbf373f21d6502a9012b129 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/28] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 665601cddb4df09bb6ff552fff485aa80ea0ce9b 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/28] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 1fb5037271c2c32c74ac154a1ed4c64fe2a536b3 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/28] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From c0447b226f655c9b4a0ac07b5f9fe001818ea93e 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/28] 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 5bdc29d7ff7007..74191baecb95ba 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 44c33bf589cd09e25b284eb07fe251314b53c2b1 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/28] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 587f8def15eae0118dd2d591f50e873ed37a2043 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/28] 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 77982f8185be23..5614d4aa82eb03 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 d1bbc955099d6660df364a6367d9db7c708d9ed3 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/28] 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 5bc0ec404d99ac..a12180fa1e788f 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 3ba7092bb0a2aa7357da65b45425f50d42e872e6 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/28] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 9f2ced66bcaa76acf0592b7f0d6440d9b5d2bb6a 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/28] 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 e63e5dcb2bf2fd..f34509e3317c0b 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From a2aefc6b8c9d4f9960d8ff353b3cd35f1634fd2d 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/28] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From 8a826da927754232d5b90b56035e5ba4aa396226 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/28] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From a434edba5780c93802fd2b002b5bfdf5408e67aa 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/28] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 f8ea621a398f87190956df0570b7eb897ca6d872 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/28] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 1b9082a4730013bf2d7e9aecfe1d48f2898f2dce 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/28] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From d186a6b27bf80645ff879847c55565bc283d5900 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/28] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From d50194c54f7a46f8d7118639897ae041b45bcfef 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/28] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 895d64e4014321e2a8b40df16b857eb89d736196 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/28] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 84cac7254eae9d03ec725c84f9adda78d77382aa 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/28] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 3a715100c750dc5900ebb8e1dc8db7879888a9f3 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/28] 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 fe5e461fcbf250..af9a680b13acdc 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 4c69c5b55d95d945bd603c4fc24d9f6f583e6e4d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 25/28] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 8d122df81065d664e196ba67b035d7ba84fd2919 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/28] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 0975fc93b1d550..43c60a44fed78e 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From a0136d0deedcdf3dae0e6f3c6438847fc05f32f9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 27/28] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 0da1fea83e112c..089d505e98001b 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.21
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=eae4d4641e57ef2eec75d9f76653b8a3a0dc0b91b3dcc8fbbb2ce4456a08fcfe
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 30ccf82c44147c22fa5329ef517a86571e506e3f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 28/28] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (30 preceding siblings ...)
2024-03-24 12:06 ` tranzystorekk
@ 2024-03-25 22:49 ` tranzystorekk
2024-03-26 12:54 ` tranzystorekk
` (2 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-25 22:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 33701 bytes --]
From 4b343fd3fae2ca9dd2be491a44ee7daae0c30f93 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/28] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..a09b7483e0866c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From b82c05a981b84588082f43ad5664875e78fd927b 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/28] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 149b0d23eb1a6b42afa3d274cc3357cd5658653f 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/28] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 4eeea5d19d0c3bb00f02f6b15cd5024865edc137 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/28] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From f8f063bf0d5a604ad6703e85eb4f26ed1012a06a 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/28] juCi++: rebuild for libgit2-1.7
---
srcpkgs/juCi++/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index fc4d5b8ea2ef37..685e332af9ee22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.7.2
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 clang17-devel 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 967494c18305672f11d32c77d2c1d4fd54a45a57 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/28] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 84603b7187fec46d9b022edbcc7ae9a075fb1ea1 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/28] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 e4dd83f880698fa0d85d42748d423de836930d7f 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/28] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 9fd649ee9ce8343d5bb317c02bb74297a4f697d8 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/28] 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 5bdc29d7ff7007..74191baecb95ba 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 31d35724983a7677bfd226fbdfe0ce6703fead3b 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/28] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 fee8aafe1f83c30754f54ae81ce74fec8b450d3e 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/28] 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 77982f8185be23..5614d4aa82eb03 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 291c4962fee44def30193ce366963ba3319831c6 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/28] 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 5bc0ec404d99ac..a12180fa1e788f 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 d58cc44f038947b11fda5c09ed470f76dcc53556 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/28] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From c385a04b99541924ff6c213deb8f5238167023c4 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/28] 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 e63e5dcb2bf2fd..f34509e3317c0b 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From da04c34e9381c0aa425c314f1a7aa28ee0944858 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/28] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From abe056bed73824fa2a1d2b9f09a323e9e0b49f0c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/28] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From e68554c209608508f83d10e83b0fea37b4064c0e 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/28] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 07181f757622e341b4b1c4adfa9a9862c8fa2983 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/28] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 61ef7dd4f4b535e671f7cb6c13fe960aac89cb8d 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/28] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From fb9545a1cb8a7e1f216302bd70875c77774437a6 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/28] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From d9b7ebf5b573aefd7bf94894442c2daaa59d957e 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/28] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 4b8edc5e7d1e98d386c3d0a54a368d2e10da557f 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/28] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 0049b1e305644bd1ee7a0de8a3be72e269b91653 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/28] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 35a3d9df446f6926af58810041db87d20a8e56b5 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/28] 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 fe5e461fcbf250..af9a680b13acdc 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 51bd458f60e33ab73371b0488ba4be20f6b365d9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 25/28] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 912f8f87910bfbae152d6a891b75ba2335a4284e 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/28] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 0975fc93b1d550..43c60a44fed78e 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From 3d734d5632a0eebef2bffe787ee370ae25a9f0c5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 27/28] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 40093c8b90bf5b..7f18d43c888ec5 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.24
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=9a9d91d1a5dcfecf5029931530d417fc3febf4c469d7d7b9567845c4210bb59b
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From db463c973ec17c0b6b27f5f57912b264d3b2cce0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 28/28] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (31 preceding siblings ...)
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
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-26 12:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 33765 bytes --]
From 07706c05e633bedac45527784ecf7e12cb975c0c 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/28] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..a09b7483e0866c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 3377e7cc03b77fd0edc1c3160a18ba96385e61a2 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/28] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From 5fc83badcbd5dab4d628b30d2ba459d678e872b3 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/28] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 948d082356b50b3077a51cd6e021d522ddaef696 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/28] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From d3d8eae669a92e26eba42c8711d0c521815d1a06 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/28] 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 fc4d5b8ea2ef37..8bc1eec9bf453d 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,10 +1,10 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=7
+revision=8
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
-create_wrksrc=yes
+build_wrksrc=jucipp-v${version}
build_style=cmake
hostmakedepends="pkg-config"
makedepends="aspell-devel clang17-devel 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 dac64e37d616f05a97799659436dfea2c9890836 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/28] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 36d49a4d53c37edb9d890abd7b045964c305138e 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/28] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 6ca7ee7a83f65e0c2b14c3b8a45a6090812e917b 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/28] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 6d8dccf1b3a228a2c676138bf6c303c06e857029 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/28] 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 5bdc29d7ff7007..74191baecb95ba 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 74646789319310a40dc0e40dcc1952414136d72a 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/28] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 f031ba7ddabcb420e3bbb5875d3a71479be3afa3 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/28] 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 77982f8185be23..5614d4aa82eb03 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 553e659276793d5927bb73e334933a9aefab3d37 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/28] 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 5bc0ec404d99ac..a12180fa1e788f 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 ffdfdfb75a94543b06197644f389ce7a6392360e 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/28] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From 5a71f2f63a99a878cb26e7981d00986a673e8662 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/28] 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 e63e5dcb2bf2fd..f34509e3317c0b 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 280df53e8a371fffe807b8d5814c85ed2591cf4c 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/28] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From cc9f5f99e8ad31b9ac40fe88802c102704a9f841 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/28] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 49503e728670bec8f7e6b31d4e12d71e2eb246ae 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/28] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 09d4454c4e79e25513f8edccad78e3cb28586411 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/28] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 b5602b224db431f87ec1c8636e8b57caac485af0 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/28] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From fde1577348da4fca7e749031cea1bf7f8aea629a 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/28] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From baceec1a6332369c6b8a788684f44737b72b13f4 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/28] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 38139bbf98d059d8416eb75d5ef479a5f27bb313 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/28] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From 055236657a209b515c8c8512c16211b3d91751ab 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/28] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 87374a73a2977b9cad9b6eeff362f3501f06cd1d 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/28] 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 fe5e461fcbf250..af9a680b13acdc 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 a11724c3b9bf51774058ae164340c45e9e68a471 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 25/28] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From 316c8062c85a0553913e9b8385f5d6c254134bd0 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/28] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 0975fc93b1d550..43c60a44fed78e 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From 29cff20bc3d34df5e244732821898d7357cd6ec6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 27/28] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 40093c8b90bf5b..7f18d43c888ec5 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.24
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=9a9d91d1a5dcfecf5029931530d417fc3febf4c469d7d7b9567845c4210bb59b
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 58f6d37ac6ab9fb00259426be5954e7d7ca647d6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 28/28] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (32 preceding siblings ...)
2024-03-26 12:54 ` tranzystorekk
@ 2024-03-26 17:18 ` tranzystorekk
2024-03-28 14:13 ` [PR PATCH] [Merged]: " cinerea0
34 siblings, 0 replies; 36+ messages in thread
From: tranzystorekk @ 2024-03-26 17:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 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
libgit2: update to 1.7.2
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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: 33765 bytes --]
From c97a29d3af00bb5fd017f2c4e1e1022dfc3b7576 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/28] libgit2: update to 1.7.2
---
common/shlibs | 2 +-
.../patches/fix-missing-oid-type.patch | 24 -------------------
srcpkgs/libgit2/template | 4 ++--
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index a60c03a1473078..a09b7483e0866c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1335,7 +1335,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.2_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_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 8d24809f244a1d..00000000000000
--- 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 934338ef7b8963..5c4e1a48a75c7c 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.6.5
+version=1.7.2
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
@@ -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=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75
+checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 217062acf4206b83fca6a83c00d8db6131096f94 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/28] python3-pygit2: update to 1.13.3
---
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 848b4abcdaae1e..34d2aef6920200 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.3
+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=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
From cf03d5b773329e6759e9cd542c5f186def337bfd 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/28] 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 cdc0366e2136e6..37a02337da3736 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.2.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From bb5f5fd0ad046bd3cb87412dcd88f84094e85f36 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/28] 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 421700baadd3c6..bb226c8b1a95e6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=18
+revision=19
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From fed0e87375e7de7be4ace404463483f2be03b831 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/28] 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 fc4d5b8ea2ef37..8bc1eec9bf453d 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,10 +1,10 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=7
+revision=8
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
-create_wrksrc=yes
+build_wrksrc=jucipp-v${version}
build_style=cmake
hostmakedepends="pkg-config"
makedepends="aspell-devel clang17-devel 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 aee85411947f78754af5b414d62d93a69697b993 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/28] 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 d9f6ec63602a7e..e7dac8c18e6cf2 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=2
+revision=3
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
From 393ea6b109028eca6f91311121a15020d8fa705d 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/28] 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 b61a1a8c1dfa2a..dd3f1dc81df5a8 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 ac02040c0dc26e84e44c0f721182a344dade35fb 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/28] 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 47d681f66d75bd..16bbf70822d672 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.5.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 6a033e6001ddc1cf3548503f882aff2c2cf50f38 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/28] 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 5bdc29d7ff7007..74191baecb95ba 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 fb62ef881ed5f9edcc1e23bba58459977a25e69a 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/28] 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 3a4caeccf8bb86..dc2e7dce866a8e 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 dcdfc67828fe24ce28a36148d19cd691a210b20a 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/28] 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 77982f8185be23..5614d4aa82eb03 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 bc2e2e237618da6a73f3ea394f210955e8ce6b96 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/28] 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 5bc0ec404d99ac..a12180fa1e788f 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 59a011753c22540eae7bb379fea84c04e4b1471a 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/28] 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 ce34fcfbaff42b..77692b2af0cfb5 100644
--- a/srcpkgs/geany-plugins/template
+++ b/srcpkgs/geany-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-all-plugins
--disable-geniuspaste --disable-updatechecker --disable-debugger"
From c7e1170c37760e5d0fdc0d430893ac8660c91cd9 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/28] 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 e63e5dcb2bf2fd..f34509e3317c0b 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=46.0
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 1359cfad6bcef82ef4539cd4572dc45d530b3f1a 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/28] 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 22bfd980ba9e3f..df064355f7e00c 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
# jemalloc-sys
export JEMALLOC_SYS_WITH_LG_PAGE=16
+
+# libgit2-sys
+export LIBGIT2_NO_VENDOR=1
From be98ef00a9646944091456d92856a88da1c188b3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 30 Nov 2023 10:27:06 +0100
Subject: [PATCH 16/28] cargo: rebuild for libgit2-1.7
---
srcpkgs/cargo/patches/downgrade-git2.patch | 67 ----------------------
srcpkgs/cargo/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch
diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch
deleted file mode 100644
index c35a90d0ce555b..00000000000000
--- a/srcpkgs/cargo/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 36cf880..72aca65 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1025,11 +1025,11 @@ dependencies = [
-
- [[package]]
- name = "git2"
--version = "0.18.1"
-+version = "0.17.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
-+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
- dependencies = [
-- "bitflags 2.4.1",
-+ "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
-@@ -1040,9 +1040,9 @@ dependencies = [
-
- [[package]]
- name = "git2-curl"
--version = "0.19.0"
-+version = "0.18.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c"
- dependencies = [
- "curl",
- "git2",
-@@ -2065,9 +2065,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 c07b004..68c45a0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -40,8 +40,8 @@ curl = "0.4.44"
- curl-sys = "0.4.70"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
--git2-curl = "0.19.0"
-+git2 = "0.17.2"
-+git2-curl = "0.18.0"
- gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -58,7 +58,7 @@ itertools = "0.12.0"
- jobserver = "0.1.27"
- lazycell = "1.3.0"
- libc = "0.2.150"
--libgit2-sys = "0.16.1"
-+libgit2-sys = "0.15.2"
- libloading = "0.8.1"
- memchr = "2.6.4"
- miow = "0.6.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 4ca4a399560370..71c35f0f1ccd6d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.76.0
-revision=1
+revision=2
_cargo_revision=0.77.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel"
From 25f7e06826b50158d471d09e7251f1efad2d49fb 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/28] 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 c2289468320690..00000000000000
--- 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 55ef7ae8fa22a6..a7f31c22a57ae5 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 5b1ba545fee3d42c45c4ef33cb49be2edb8ed015 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/28] 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 f136b8ce6ad26e..6284cfaaecb0ca 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 ffb0de5303e78fd6728da3c65f9b27208f260675 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/28] cocogitto: rebuild for libgit2-1.7
---
srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 -------------
srcpkgs/cocogitto/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch
diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch
deleted file mode 100644
index f8eee30c536ed3..00000000000000
--- a/srcpkgs/cocogitto/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2608ea1..b0d3282 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,7 +20,7 @@ codegen-units = 1
- panic = "abort"
-
- [dependencies]
--git2 = { version = "0.18.2", default-features = false, features = [] }
-+git2 = { version = "0.17", default-features = false, features = [] }
- # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353)
- anyhow = "1.0.75"
- colored = "^2"
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 9cf450abe47805..44cfee066eccac 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=6.1.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From a1f5fedf28cebcd211da24a3c9d3331edf624901 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/28] delta: rebuild for libgit2-1.7
---
srcpkgs/delta/patches/downgrade-git2.patch | 13 -------------
srcpkgs/delta/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch
diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
deleted file mode 100644
index 2f1e88ea6e3700..00000000000000
--- a/srcpkgs/delta/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index d55c68e..b80247b 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
- terminal-colorsaurus = "0.3.1"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- features = []
-
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index d32063d2489442..a954706638ab1d 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.17.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
# https://github.com/dandavison/delta/issues/1637
@@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE
From 097200c9481609365c6a424dfbca0d829ad70baa 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/28] 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 9f4eb5bee96aa5..00000000000000
--- 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 9f027c90977ff8..2e6bd12fb55c4d 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,7 +1,7 @@
# Template file for 'eza'
pkgname=eza
version=0.18.8
-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=4169f57c522cd17e195a7bc36a9ea671e5b1d905f9ab57c66a49f6edf343179c
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 5999713e29656eeac42116927cab8c4e97f72076 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/28] git-absorb: rebuild for libgit2-1.7
---
srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-absorb/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch
deleted file mode 100644
index afcacd4a8df052..00000000000000
--- a/srcpkgs/git-absorb/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 97dc720..85435bc 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -21,7 +21,7 @@ name = "git-absorb"
- path = "src/main.rs"
-
- [dependencies.git2]
--version = "~0.18"
-+version = "~0.17"
- default-features = false
-
- [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index dff6ab4145e4ec..7b87f6995f633d 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.12
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b
-post_patch() {
- cargo update --package git2@0.18.1 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From b622e0163b87d2388eaf1dcc7c93f9cbd129c438 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/28] 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 258d95adffdb10..00000000000000
--- 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 d7611bc..f88a763 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true }
- url = "2.5.0"
-
- [dependencies.git2]
--version = "0.18.2"
-+version = "0.17"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index cbb5a4852e9cfa..c9f0b362c5132d 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -21,10 +21,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=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vdoc README.md
From 11b380e710958ab117f68b6c6c0d667780f4fe0f 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/28] 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 fe5e461fcbf250..af9a680b13acdc 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 2d0c3ad1fc5294d5196f13fee1456631bd9589cd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 7 Feb 2024 13:30:46 +0100
Subject: [PATCH 25/28] jujutsu: rebuild for libgit2-1.7
---
srcpkgs/jujutsu/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template
index 6fa0957d787a79..9572c3d2697857 100644
--- a/srcpkgs/jujutsu/template
+++ b/srcpkgs/jujutsu/template
@@ -1,7 +1,7 @@
# Template file for 'jujutsu'
pkgname=jujutsu
version=0.15.1
-revision=2
+revision=3
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,12 +17,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz
checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e
conflicts="jj>=0"
-pre_configure() {
- # Downgrade to use Void system libgit2 1.6
- vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
do_install() {
for f in target/*/release/jj; do
vbin $f
From ac276df5b906ac489bc0738df9f3b1076d4c76f3 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/28] lsd: rebuild for libgit2-1.7
---
srcpkgs/lsd/patches/downgrade-git2.patch | 13 -------------
srcpkgs/lsd/template | 6 +-----
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 srcpkgs/lsd/patches/downgrade-git2.patch
diff --git a/srcpkgs/lsd/patches/downgrade-git2.patch b/srcpkgs/lsd/patches/downgrade-git2.patch
deleted file mode 100644
index 749ce03865ab05..00000000000000
--- a/srcpkgs/lsd/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 1fa32ac..815cbda 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -46,7 +46,7 @@ xdg = "2.5"
-
- [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.18", optional = true, default-features = false }
-+git2 = { version = "0.17", optional = true, default-features = false }
-
- [target.'cfg(unix)'.dependencies]
- users = { version = "0.11.3", package = "uzers" }
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index cfc9a72cad2be0..d2b342d3de0f03 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,7 +1,7 @@
# Template file for 'lsd'
pkgname=lsd
version=1.1.2
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel"
@@ -24,10 +24,6 @@ fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
-post_patch() {
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
From 32af3296eacaf818b6d0becc676360643a0c427d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:31:51 +0100
Subject: [PATCH 27/28] uv: rebuild for libgit2-1.7
---
srcpkgs/uv/template | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template
index 40093c8b90bf5b..7f18d43c888ec5 100644
--- a/srcpkgs/uv/template
+++ b/srcpkgs/uv/template
@@ -1,7 +1,7 @@
# Template file for 'uv'
pkgname=uv
version=0.1.24
-revision=1
+revision=2
build_style=python3-pep517
build_helper="rust qemu"
hostmakedepends="maturin cargo cmake pkg-config"
@@ -16,12 +16,6 @@ checksum=9a9d91d1a5dcfecf5029931530d417fc3febf4c469d7d7b9567845c4210bb59b
# many tests require old python versions
make_check=no
-post_patch() {
- # Downgrade to use system libgit2 1.6
- vsed -i 's/git2 =.*"0.18.1".*/git2 = "0.17.2"/' Cargo.toml
- cargo update --package git2@0.18.2 --precise 0.17.2
-}
-
post_install() {
vlicense LICENSE-MIT
for sh in bash fish zsh; do
From 787fc6503aff01a724db77103ab09cb23cd8897f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 22 Mar 2024 09:44:03 +0100
Subject: [PATCH 28/28] kicad: rebuild for libgit2-1.7
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index fe4324fa7019bd..c0847a070c0e76 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=8.0.1
-revision=1
+revision=2
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
build_wrksrc="${pkgname}-${version}"
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PR PATCH] [Merged]: libgit2: update to 1.7.2
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 tranzystorek-io
` (33 preceding siblings ...)
2024-03-26 17:18 ` tranzystorekk
@ 2024-03-28 14:13 ` cinerea0
34 siblings, 0 replies; 36+ messages in thread
From: cinerea0 @ 2024-03-28 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]
There's a merged pull request on the void-packages repository
libgit2: update to 1.7.2
https://github.com/void-linux/void-packages/pull/45976
Description:
[ci skip]
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Todos:
- [x] cargo-edit
- [x] 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
-->
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2024-03-28 14:13 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-08 17:43 [PR PATCH] [WIP] libgit2: update to 1.7.1 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
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
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).