* [PR PATCH] libgit2: update to 1.6.4
@ 2023-04-14 8:40 tranzystorek-io
2023-04-14 8:44 ` tranzystorek-io
` (8 more replies)
0 siblings, 9 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-14 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 15554 bytes --]
From f392b942c9391d9f92a57c1c4b3513ddc897cb11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 4 ++--
4 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..c27207f0d898 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 25a9b63bfc66f4031ea9717138e505689391db4b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0
---
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 e95cda9aa1aa..ab0d0be73538 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.10.1
-revision=2
+version=1.12.0
+revision=1
build_style=python3-module
hostmakedepends="pkg-config python3-devel python3-setuptools"
makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi 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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From 7893a88ee6406134b4f6d5fa7e1c5b92d5a5a7c3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=12
+revision=13
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 51e3d7ec691492bbae2fe40628132bfa1c776ded Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 2a87b9164b3de33535614d0692f00aba24355301 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From bfcc7453d32e4406dff34c5f1d82eb2dba3ac1a9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From a721fa5185844b1015d6f09de5dbad8f913654b1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 1c03b8fabae9433ef6e6c4c202106b48f4b78401 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 892dd271bd414072a791d9513e51f0cca0d81c4b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From e26564ecd92e93a0acfee785ca6a603f46613ffc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 32758ba3da1182e46ef4595b78b1593afe38df91 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 57e1c2f37dce10a6801590569eeb21ced38290de Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 4660e2cd5e22d75f65d75edb5601576db227702a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2
---
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 4b56136453bd..d4e91ad17997 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From a125ca6dbdae7d0e3db6f99e34526df10820296e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..adaaae84a56f
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index af87b70..99e4f31 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ pretty_env_logger = { version = "0.4", optional = true }
+ anyhow = "1.0.47"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -46,7 +46,7 @@ libc = "0.2"
+ log = "0.4.6"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ memchr = "2.1.3"
+ opener = "0.5"
+ os_info = "3.5.0"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 653c5db..b65b242 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -17,7 +17,7 @@ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+ pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+ time = { version = "0.3", features = ["parsing", "formatting"]}
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 09be821c96ef..cfb070dfde20 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.68.2
-revision=1
+revision=2
_cargo_revision=0.69.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
@ 2023-04-14 8:44 ` tranzystorek-io
2023-04-14 8:56 ` [PR PATCH] [Updated] " tranzystorek-io
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-14 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/43435#issuecomment-1508154496
Comment:
Rust packages manage the linked libgit2 version via `git2` and friends, requiring manual bumps to avoid rebuilds and static bundles.
I'm not sure if it's acceptable to let them do that or if we should manually bump the deps (as demonstrated in `cargo`).
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
2023-04-14 8:44 ` tranzystorek-io
@ 2023-04-14 8:56 ` tranzystorek-io
2023-04-14 11:23 ` tranzystorek-io
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-14 8:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 15729 bytes --]
From f392b942c9391d9f92a57c1c4b3513ddc897cb11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 4 ++--
4 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..c27207f0d898 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 3accc96c597c16240bda73236eda0a676b3d7ce2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0
---
srcpkgs/python3-pygit2/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..8e470940171f 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools"
+version=1.12.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="pkg-config python3-devel python3-setuptools python3-wheel"
makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
openssl-devel"
depends="python3-cached-property python3-cffi"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From addfe10c41d3db7f04b6bdae5e1be40c09db52d7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=12
+revision=13
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 8d29c0b4f55109d9df653160b4baefff96d28e2b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 3570874eec4fcf011dfa8f8cd9d8e9623c6dd037 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 8aaf04bf64ee199a08f63c0175d596a3d176377c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From cfb4258048a4d323eaed4e45ea359ff5db55c0cd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 41e3448d8cab4b18458ba9bbf8adbf75437c7449 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 64752b217f99152453783898fa21cc367ab2be04 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From e731ca59b7efbd2df81677ae160638feaaa172e1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 73adb9ade579e9eae35b32553e709b310d3891dd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From af26ff6c7d8591c8a1ca1f6bf76ef0355bab2115 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 756a047dbf7bde3f6f4fbf894c6258c70387065c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2
---
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 4b56136453bd..d4e91ad17997 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From eb6edf225a980a5efc38b82c484385f12764162f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..adaaae84a56f
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index af87b70..99e4f31 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ pretty_env_logger = { version = "0.4", optional = true }
+ anyhow = "1.0.47"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -46,7 +46,7 @@ libc = "0.2"
+ log = "0.4.6"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ memchr = "2.1.3"
+ opener = "0.5"
+ os_info = "3.5.0"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 653c5db..b65b242 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -17,7 +17,7 @@ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+ pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+ time = { version = "0.3", features = ["parsing", "formatting"]}
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 09be821c96ef..cfb070dfde20 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.68.2
-revision=1
+revision=2
_cargo_revision=0.69.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
2023-04-14 8:44 ` tranzystorek-io
2023-04-14 8:56 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2023-04-14 11:23 ` tranzystorek-io
2023-04-14 21:48 ` tranzystorek-io
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-14 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 15857 bytes --]
From f392b942c9391d9f92a57c1c4b3513ddc897cb11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 4 ++--
4 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..c27207f0d898 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 5972594c4aa554558aad0d53cc94104b919ff78c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0
---
srcpkgs/python3-pygit2/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..1cdaa7718bf2 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools"
-makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
+version=1.12.0
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
checkdepends="python3-pytest"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From 7348d4f6bf2e8d9724487cb87c919d4bce05e1fa Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=12
+revision=13
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From f23d1f2ed2188d7a865a3c9d28e1513205976b16 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 25d7dd006b7e290ca7b1f5dbc7427f6e0d3ccdf3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 65a55651444fb92193e2542318c2c6c2d51ba48b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 0cd3164f28fdffe72d98f44781410016d4f0dd68 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From bc7b3a1fb4bc0126de54513c9c7db383a53fbee4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 14a3f22f4e37d6580e455243f797bd8b58f74591 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From e79aa5f2502d65295338776e5c24da0e0fd32d06 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 0dd79abf5f09d6015736f7726f1847a44354648e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 1ce6cae2afcbc9dc58ae0334a26e0f9ca7d54fb2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 0c2796cfa18ba6cd8c8da42b578e0e1bf5b117b0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2
---
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 4b56136453bd..d4e91ad17997 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From ae7280be9e39580cc779eec632f57e91ddb8f81b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..adaaae84a56f
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index af87b70..99e4f31 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ pretty_env_logger = { version = "0.4", optional = true }
+ anyhow = "1.0.47"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -46,7 +46,7 @@ libc = "0.2"
+ log = "0.4.6"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ memchr = "2.1.3"
+ opener = "0.5"
+ os_info = "3.5.0"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 653c5db..b65b242 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -17,7 +17,7 @@ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+ pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+ time = { version = "0.3", features = ["parsing", "formatting"]}
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 09be821c96ef..cfb070dfde20 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.68.2
-revision=1
+revision=2
_cargo_revision=0.69.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (2 preceding siblings ...)
2023-04-14 11:23 ` tranzystorek-io
@ 2023-04-14 21:48 ` tranzystorek-io
2023-04-21 11:17 ` tranzystorek-io
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-14 21:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 16317 bytes --]
From da531f68005f39ac707e8f719e19f80d718d466e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 4 ++--
4 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..c27207f0d898 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 65a4902a78d2ae58a9a4632ec65989c17ef4539c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0
---
srcpkgs/python3-pygit2/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..1cdaa7718bf2 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools"
-makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
+version=1.12.0
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
checkdepends="python3-pytest"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From 40f59572909e776398369b776d991c1949e0651d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=12
+revision=13
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 9a5d39d23f0ab07e4dc2d78e27fa21b0aff6b577 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 226eca7da2f107f0730f5718e4ea51d48c02b434 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 341f8f50a08a44ab1071ee75534a874894a30e59 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 673d3807cc191fd88b44c2161712bef36fa9fbb9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 7f6595169606488427ce75cb5a2a3c1261f1852f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 3f45e0c69880d72f958b3c0680fa4b539a551a60 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From f1c8f1e24db118ae0a6e908c0cd34a17717ae868 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From cb31c3660f8f4f2947b97eeaec1538b19cefb4fd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 33fca1d1970f77631ca1ecac94318bfbedb5dc5d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From aefb8013fc37e9f51d312c59a5f65d2b70b4d0e5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2
---
srcpkgs/gnome-builder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 95576fbca7fedf51cb2e0a3e54449c277d239077 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..adaaae84a56f
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index af87b70..99e4f31 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ pretty_env_logger = { version = "0.4", optional = true }
+ anyhow = "1.0.47"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -46,7 +46,7 @@ libc = "0.2"
+ log = "0.4.6"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ memchr = "2.1.3"
+ opener = "0.5"
+ os_info = "3.5.0"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 653c5db..b65b242 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -17,7 +17,7 @@ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+ pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
+ time = { version = "0.3", features = ["parsing", "formatting"]}
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 09be821c96ef..cfb070dfde20 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.68.2
-revision=1
+revision=2
_cargo_revision=0.69.1
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (3 preceding siblings ...)
2023-04-14 21:48 ` tranzystorek-io
@ 2023-04-21 11:17 ` tranzystorek-io
2023-06-09 11:07 ` tranzystorek-io
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-04-21 11:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 16221 bytes --]
From 5a3f6a30e222fb6bd617b2575b311d9703cc99d3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/14] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 4 ++--
4 files changed, 7 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index 0b05cd99d6b3..936a79709fe5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From cb2d4ee0645aed9df749cb328d0c9f02271b0e67 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/14] python3-pygit2: update to 1.12.0
---
srcpkgs/python3-pygit2/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index e95cda9aa1aa..1cdaa7718bf2 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools"
-makedepends="python3-devel libgit2-devel python3-cached-property python3-cffi libssh2-devel
+version=1.12.0
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
checkdepends="python3-pytest"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From dada0b671bb2f4d96245ecbef567f582ff2f84a9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:24:32 +0200
Subject: [PATCH 03/14] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index fa2d3a09c3dd..d0bdd2fec265 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=12
+revision=13
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From e0f09485214d6c3af6de262952d0028f8f6d231d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 04/14] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 0af3bce0118d713be670876c845ea7036b28547a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 05/14] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 8d1975305a22d69f0daece16d56b8514db8dd3bb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 06/14] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From eb8e7d3e7d26fbcc93ec321dc5936b499958bf01 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:29:24 +0200
Subject: [PATCH 07/14] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 34b04ee11a99..4d7fe5cb44d9 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 884578625a64ffb10d454c96dbf8a03255195416 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:30:27 +0200
Subject: [PATCH 08/14] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 416bde7cc4d0..ad903e98b150 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=3
+revision=4
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 97654595f98f51dc8f25f1522656bb7ee72d3d9d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 09/14] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From d74a063d563e6069b3014defce7a4d48e7cb7261 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 10/14] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 67c4ca76b05f36b57a894c74f522371205f08264 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 11/14] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 9910be513940d161451c38e09a3c6c253a23fdc2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 3b0487a534394dcf3eb7c1980ced98a5e5603e1f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 13/14] gnome-builder: rebuild for libgit2
---
srcpkgs/gnome-builder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 7c2dd9255448d6b37cfad8cb541b85cad7411abb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/14] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..e15bff538ab0
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 66c3e5f..9f1164c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ curl-sys = "0.4.59"
+ env_logger = "0.10.0"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -47,7 +47,7 @@ lazycell = "1.2.0"
+ libc = "0.2"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ log = "0.4.6"
+ memchr = "2.1.3"
+ opener = "0.5"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 6c4b251..91e6e4e 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -14,7 +14,7 @@ cargo-util = { path = "../cargo-util" }
+ crates-io = { path = "../crates-io" }
+ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 6b748e7f95f3..d96ab9115ebf 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.69.0
-revision=1
+revision=2
_cargo_revision=0.70.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (4 preceding siblings ...)
2023-04-21 11:17 ` tranzystorek-io
@ 2023-06-09 11:07 ` tranzystorek-io
2023-06-10 11:42 ` tranzystorek-io
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-06-09 11:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 14111 bytes --]
From 86c9635e3f91b71f3a27ea8ae127bbe0f2c92564 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/11] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...clar-remove-ftrunacte-from-libgit2-tests.patch | 15 ---------------
...ble-test-validate_current_user_ownership.patch | 8 ++++----
srcpkgs/libgit2/template | 6 +++---
4 files changed, 8 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
diff --git a/common/shlibs b/common/shlibs
index e34e372b84f0..d15d0f14a0af 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 9d9da1496d67..24b56f20099a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 pkg-config"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From f83a40ab838551f80bc24f12fb45f35b0150dc90 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/11] python3-pygit2: update to 1.12.0
---
srcpkgs/python3-pygit2/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 307a83fff604..1cdaa7718bf2 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+version=1.12.0
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=e9440d08665e35278989939590a53f37a938eada4f9446844930aa2ee30d73be
From 3e302527b50f5a442a5d6ee9a370c7d55fd5978a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 03/11] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From b5334a82afaf25823728d68da23f1ccb05085e9a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 04/11] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 58506c81cbf9a75a23512c3941b6810eb27cdda7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 05/11] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 4049ad3577b4ffbf0109d18bb276e5b0813e79d8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 06/11] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From 72a2abd1ae50cc1bd4df28ebda67296bfcea4b02 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 07/11] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From a5ed8b74d1069181dd3a9255ff5190fcf7a4648a Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 08/11] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 3066fe2484d1dae7b153ae6c3fa8c0c1407aee32 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 09/11] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 02fd3f4bbce863c0b90cbf1cb9ee6c40c7818fa4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 10/11] gnome-builder: rebuild for libgit2
---
srcpkgs/gnome-builder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 610ff2fd850088084069504aea979c3b196db7ab Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 11/11] cargo: rebuild for libgit2
---
srcpkgs/cargo/patches/libgit2-1.6.patch | 37 +++++++++++++++++++++++++
srcpkgs/cargo/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo/patches/libgit2-1.6.patch
diff --git a/srcpkgs/cargo/patches/libgit2-1.6.patch b/srcpkgs/cargo/patches/libgit2-1.6.patch
new file mode 100644
index 000000000000..e15bff538ab0
--- /dev/null
+++ b/srcpkgs/cargo/patches/libgit2-1.6.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 66c3e5f..9f1164c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -28,8 +28,8 @@ curl-sys = "0.4.59"
+ env_logger = "0.10.0"
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
+-git2-curl = "0.17.0"
++git2 = "0.17.0"
++git2-curl = "0.18.0"
+ glob = "0.3.0"
+ hex = "0.4"
+ hmac = "0.12.1"
+@@ -47,7 +47,7 @@ lazycell = "1.2.0"
+ libc = "0.2"
+ # Temporarily pin libgit2-sys due to some issues with SSH not working on
+ # Windows.
+-libgit2-sys = "=0.14.1"
++libgit2-sys = "=0.15.0"
+ log = "0.4.6"
+ memchr = "2.1.3"
+ opener = "0.5"
+diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml
+index 6c4b251..91e6e4e 100644
+--- a/crates/cargo-test-support/Cargo.toml
++++ b/crates/cargo-test-support/Cargo.toml
+@@ -14,7 +14,7 @@ cargo-util = { path = "../cargo-util" }
+ crates-io = { path = "../crates-io" }
+ filetime = "0.2"
+ flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
+-git2 = "0.16.0"
++git2 = "0.17.0"
+ glob = "0.3"
+ itertools = "0.10.0"
+ lazy_static = "1.0"
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 6b748e7f95f3..d96ab9115ebf 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.69.0
-revision=1
+revision=2
_cargo_revision=0.70.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (5 preceding siblings ...)
2023-06-09 11:07 ` tranzystorek-io
@ 2023-06-10 11:42 ` tranzystorek-io
2023-06-10 11:57 ` tranzystorek-io
2023-06-11 11:42 ` [PR PATCH] [Closed]: " classabbyamp
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-06-10 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 28344 bytes --]
From 8748f34203f0118c67aea3f00c576bdaf1f776c3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/23] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...-remove-ftrunacte-from-libgit2-tests.patch | 15 ------------
...test-validate_current_user_ownership.patch | 8 +++----
.../patches/fix-missing-oid-type.patch | 24 +++++++++++++++++++
srcpkgs/libgit2/template | 6 ++---
5 files changed, 32 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
create mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 0b1bca75e5d6..66b2ff27e345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
new file mode 100644
index 000000000000..8d24809f244a
--- /dev/null
+++ b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
@@ -0,0 +1,24 @@
+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 9d9da1496d67..24b56f20099a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 pkg-config"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From d7757b9a0ee072c3e7d3265b925e5dd08b8c0d89 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/23] python3-pygit2: update to 1.12.1
---
srcpkgs/python3-pygit2/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 307a83fff604..b8db662c7715 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+version=1.12.1
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3
From 32ac8fd89398743b5fba7d1e1ece0d6c60951a22 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 03/23] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From ce51970558afc33bc0c1582c0d10af888ecc0180 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 04/23] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 684cf0d835d90c5637e363898a0029c1ec544f80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 05/23] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From f1cd439731119da71ffd06a357a338690aad353d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 06/23] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From fbda1661c25550e8da27cb09beb6c2e480df068d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 07/23] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 646ce339c38da9e3e3430860b1d72b1abd4ae8e6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 08/23] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 5d9bd3df923f73caa040a824369cb1aea79036e7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 09/23] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 7a551979bb98e91ef32191b8be0ad94d869605b2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 10/23] gnome-builder: rebuild for libgit2
---
srcpkgs/gnome-builder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 17518f434329dfcce7dda542d8df8387b1e935d8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:29:54 +0200
Subject: [PATCH 11/23] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index ad903e98b150..1948023bd290 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=4
+revision=5
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From c3b7fbf1a19f481cbab4695b8286c0a1c9c7b7e4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:30:40 +0200
Subject: [PATCH 12/23] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 4d7fe5cb44d9..1d1b8cf1891c 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 713048f1455276f5a19ff14efeef445d292830c0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:18:59 +0200
Subject: [PATCH 13/23] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index d0bdd2fec265..38d7984727af 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=13
+revision=14
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From e16b4d26acb54ad0e0b4f7e946d1b71ff02e999d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/23] cargo: rebuild for libgit2
---
srcpkgs/cargo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 3921088c1e04..5c610b2bcf83 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.70.0
-revision=1
+revision=2
_cargo_revision=0.71.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
From b43524c013b90031ac46c64255627713ed6ae93c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:39:55 +0200
Subject: [PATCH 15/23] cargo-edit: update to 0.12.0
---
srcpkgs/cargo-edit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index e8cf16b500cb..70af6565c8be 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,6 +1,6 @@
# Template file for 'cargo-edit'
pkgname=cargo-edit
-version=0.11.11
+version=0.12.0
revision=1
archs="x86_64* i686* aarch64* arm*" # uses ring
build_style=cargo
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/killercup/cargo-edit"
changelog="https://raw.githubusercontent.com/killercup/cargo-edit/master/CHANGELOG.md"
distfiles="https://github.com/killercup/cargo-edit/archive/refs/tags/v${version}.tar.gz"
-checksum=9ce140e840498d61c1573ff4206214d0c41c8db24048f0f0f27b7f4464310f9a
+checksum=a8168ea2320c095f55d2b32f8bede8c814dcdc4290c250df36dc8ce0f6fb2095
post_install() {
vlicense LICENSE
From 23f1ba90db8c47bad81830339228c7427b2bb83c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:44:29 +0200
Subject: [PATCH 16/23] exa: rebuild for libgit2
---
srcpkgs/exa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ec5649613174..89bf6611d9fb 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,7 +1,7 @@
# Template file for 'exa'
pkgname=exa
version=0.10.1
-revision=3
+revision=4
create_wrksrc=yes
build_wrksrc="${pkgname}-${version}"
build_style=cargo
From 6001311ebdf8cddcc9236c5a69e7b5eabac7e326 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:45:07 +0200
Subject: [PATCH 17/23] git-series: rebuild for libgit2
---
srcpkgs/git-series/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 79c561af76b6..365dc53ab02d 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=15
+revision=16
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
@@ -10,7 +10,7 @@ short_desc="Track patch series in git"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/git-series/git-series"
-distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
+distfiles="https://github.com/git-series/git-series/archive/refs/tags/${version}.tar.gz"
checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
post_extract() {
@@ -18,9 +18,11 @@ post_extract() {
cargo update --package url@1.2.3 --precise 1.7.2
cargo update --package openssl-sys@0.9.1 --precise 0.9.60
}
+
pre_build() {
export LIBGIT2_SYS_USE_PKG_CONFIG=yes
}
+
post_install() {
vman git-series.1
vlicense LICENSE.txt
From 823e8e65079ffcbb1b7be15244db0e2ac7814edd Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:00:03 +0200
Subject: [PATCH 18/23] bat: rebuild for libgit2
---
srcpkgs/bat/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/bat/template | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/bat/patches/bump-git2.patch
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
new file mode 100644
index 000000000000..842b57d4ee6b
--- /dev/null
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 44460e0..78dfbde 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
+ bytesize = { version = "1.1.0" }
+
+ [dependencies.git2]
+-version = "0.16"
++version = "0.17"
+ optional = true
+ default-features = false
+
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index c20fc0e09edd..6d6b39fae611 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -19,7 +19,9 @@ case "$XBPS_TARGET_MACHINE" in
*) ;;
esac
-export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
pre_build() {
export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
From 9d364bbdf1aa1e025173c68aa8f2675d18e29835 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:05:15 +0200
Subject: [PATCH 19/23] cargo-update: rebuild for libgit2
---
srcpkgs/cargo-update/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/cargo-update/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo-update/patches/bump-git2.patch
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
new file mode 100644
index 000000000000..90a31fbdcb02
--- /dev/null
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index e62e9c8..1aa0658 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -52,7 +52,7 @@ tabwriter = "1.2"
+ lazysort = "0.2"
+ regex = "1.6"
+ serde = "1.0"
+-git2 = "0.16"
++git2 = "0.17"
+ home = "0.5"
+ toml = "0.5"
+ hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 086d3660bfaa..b411c99f0a7c 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=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From 4df89146f5e070cd9ec1d86c9adf60e791456e89 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:11:08 +0200
Subject: [PATCH 20/23] cocogitto: rebuild for libgit2
---
srcpkgs/cocogitto/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index dbed47399d80..a4399ef38921 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.3.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,6 +17,10 @@ checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 0dc9ae442387fe68d4f69885e202a993987b68db Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:21:18 +0200
Subject: [PATCH 21/23] delta: rebuild for libgit2
---
srcpkgs/delta/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/delta/template | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/delta/patches/bump-git2.patch
diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch
new file mode 100644
index 000000000000..05255c23c9cc
--- /dev/null
+++ b/srcpkgs/delta/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8c0c6d8..4fdaa9d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -46,7 +46,7 @@ vte = "0.11.0"
+ xdg = "2.4.1"
+
+ [dependencies.git2]
+-version = "0.16.1"
++version = "0.17"
+ default-features = false
+ features = []
+
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 7904e323b89f..e0e2c44370d7 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.16.5
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel oniguruma-devel"
@@ -13,8 +13,8 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
-pre_build() {
- export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
}
post_install() {
From c450f8bdb4f28cf2a1a4e55b0fadbe761c47496b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:25:52 +0200
Subject: [PATCH 22/23] git-absorb: rebuild for libgit2
---
srcpkgs/git-absorb/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/git-absorb/template | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/git-absorb/patches/bump-git2.patch
diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch
new file mode 100644
index 000000000000..bab771ba1be8
--- /dev/null
+++ b/srcpkgs/git-absorb/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 20a0ec5..7b86eed 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ name = "git-absorb"
+ path = "src/main.rs"
+
+ [dependencies.git2]
+-version = "~0.16"
++version = "~0.17"
+ default-features = false
+
+ [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 9af2b5ca4edb..5f7d34c5fb31 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=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From fb06fe89766a4b6775c0ee7891d3d9d0d94c0968 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:39:34 +0200
Subject: [PATCH 23/23] gitui: rebuild for libgit2
---
srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/gitui/template | 7 ++++++-
2 files changed, 19 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 000000000000..e4b5dfc1fad5
--- /dev/null
+++ b/srcpkgs/gitui/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
+index 5ab4da1..f17fbbe 100644
+--- a/asyncgit/Cargo.toml
++++ b/asyncgit/Cargo.toml
+@@ -14,7 +14,7 @@ keywords = ["git"]
+ [dependencies]
+ crossbeam-channel = "0.5"
+ easy-cast = "0.5"
+-git2 = "0.15"
++git2 = "0.17"
+ 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 a97b179e2331..14a6deb5ba43 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,8 +1,9 @@
# Template file for 'gitui'
pkgname=gitui
version=0.22.1
-revision=1
+revision=2
build_style=cargo
+make_check_args="-- --skip components::textinput::tests::test_visualize_newline"
hostmakedepends="pkg-config python3"
makedepends="libxcb-devel libgit2-devel"
short_desc="Blazing fast terminal-ui for git"
@@ -13,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=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
+post_patch() {
+ cargo update --package git2@0.15.0 --precise 0.17.2
+}
+
post_install() {
vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (6 preceding siblings ...)
2023-06-10 11:42 ` tranzystorek-io
@ 2023-06-10 11:57 ` tranzystorek-io
2023-06-11 11:42 ` [PR PATCH] [Closed]: " classabbyamp
8 siblings, 0 replies; 11+ messages in thread
From: tranzystorek-io @ 2023-06-10 11:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 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/43435
libgit2: update to 1.6.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/43435.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43435.patch --]
[-- Type: text/x-diff, Size: 28630 bytes --]
From 8748f34203f0118c67aea3f00c576bdaf1f776c3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:19:22 +0200
Subject: [PATCH 01/23] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
...-remove-ftrunacte-from-libgit2-tests.patch | 15 ------------
...test-validate_current_user_ownership.patch | 8 +++----
.../patches/fix-missing-oid-type.patch | 24 +++++++++++++++++++
srcpkgs/libgit2/template | 6 ++---
5 files changed, 32 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
create mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch
diff --git a/common/shlibs b/common/shlibs
index 0b1bca75e5d6..66b2ff27e345 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1353,7 +1353,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
deleted file mode 100644
index 4fb8488f82bb..000000000000
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Backported from:
-https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
-
-diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
---- a/tests/libgit2/CMakeLists.txt
-+++ b/tests/libgit2/CMakeLists.txt
-@@ -65,7 +65,7 @@ endif()
-
- include(AddClarTest)
- add_clar_test(libgit2_tests offline -v -xonline)
--add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
-+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
- add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
- add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 1365d1c1489b..3f316543f36b 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,13 +1,13 @@
diff --git a/tests/util/path.c b/tests/util/path.c
-index 2c39e0887..71a8d6040 100644
+index 02ec42f..60f7d70 100644
--- a/tests/util/path.c
+++ b/tests/util/path.c
-@@ -757,7 +757,7 @@ void test_path__validate_current_user_ownership(void)
+@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
-- cl_assert_equal_i(is_cur, 0);
-+ //cl_assert_equal_i(is_cur, 0); // xbps-src chroot belongs to $USER, not root
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
#endif
diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
new file mode 100644
index 000000000000..8d24809f244a
--- /dev/null
+++ b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch
@@ -0,0 +1,24 @@
+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 9d9da1496d67..24b56f20099a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
-revision=2
+version=1.6.4
+revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 pkg-config"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From d7757b9a0ee072c3e7d3265b925e5dd08b8c0d89 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:22:58 +0200
Subject: [PATCH 02/23] python3-pygit2: update to 1.12.1
---
srcpkgs/python3-pygit2/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 307a83fff604..b8db662c7715 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,9 +1,9 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.10.1
-revision=2
-build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-setuptools python3-cffi"
+version=1.12.1
+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
openssl-devel"
depends="python3-cached-property python3-cffi"
@@ -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=354651bf062c02d1f08041d6fbf1a9b4bf7a93afce65979bdc08bdc65653aa2e
+checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3
From 32ac8fd89398743b5fba7d1e1ece0d6c60951a22 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:25:19 +0200
Subject: [PATCH 03/23] DarkRadiant: rebuild for libgit2
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index ca700fe30810..8830b3a61c06 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.8.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From ce51970558afc33bc0c1582c0d10af888ecc0180 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:26:00 +0200
Subject: [PATCH 04/23] Fritzing: rebuild for libgit2
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index f76b51898007..5bdc29d7ff70 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=6
+revision=7
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
create_wrksrc=yes
build_wrksrc="app"
From 684cf0d835d90c5637e363898a0029c1ec544f80 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:28:06 +0200
Subject: [PATCH 05/23] geany-plugins: rebuild for libgit2
---
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 c5de461efb17..f0bb0b04ed80 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=2
+revision=3
build_style=gnu-configure
configure_args="--enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From f1cd439731119da71ffd06a357a338690aad353d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:31:24 +0200
Subject: [PATCH 06/23] kup: rebuild for libgit2
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 7ae6c1039399..71ecc3190b68 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From fbda1661c25550e8da27cb09beb6c2e480df068d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:32:19 +0200
Subject: [PATCH 07/23] slcp: rebuild for libgit2
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 6dd88ee79c66..77982f8185be 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=13
+revision=14
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 646ce339c38da9e3e3430860b1d72b1abd4ae8e6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:33:43 +0200
Subject: [PATCH 08/23] stagit: rebuild for libgit2
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index af92a2ab9d1c..ee27d04171d8 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.2
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
From 5d9bd3df923f73caa040a824369cb1aea79036e7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:34:44 +0200
Subject: [PATCH 09/23] libgit2-glib: rebuild for libgit2
---
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 7873e51a0b28..f20b53b73211 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=3
+revision=4
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 7a551979bb98e91ef32191b8be0ad94d869605b2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:35:25 +0200
Subject: [PATCH 10/23] gnome-builder: rebuild for libgit2
---
srcpkgs/gnome-builder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 4b56136453bd..24baa8995ae1 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=2
+revision=3
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
@@ -16,7 +16,7 @@ makedepends="cairo-devel clang enchant2-devel flatpak-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
-checkdepends="xvfb-run cmark-devel"
+checkdepends="xvfb-run cmark-devel dbus"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 17518f434329dfcce7dda542d8df8387b1e935d8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:29:54 +0200
Subject: [PATCH 11/23] juCi++: rebuild for libgit2
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index ad903e98b150..1948023bd290 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=4
+revision=5
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From c3b7fbf1a19f481cbab4695b8286c0a1c9c7b7e4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:30:40 +0200
Subject: [PATCH 12/23] horizon: rebuild for libgit2
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 4d7fe5cb44d9..1d1b8cf1891c 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.4.0
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 713048f1455276f5a19ff14efeef445d292830c0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:18:59 +0200
Subject: [PATCH 13/23] calligra: rebuild for libgit2
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index d0bdd2fec265..38d7984727af 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=13
+revision=14
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From e16b4d26acb54ad0e0b4f7e946d1b71ff02e999d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Apr 2023 10:37:29 +0200
Subject: [PATCH 14/23] cargo: rebuild for libgit2
---
srcpkgs/cargo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 3921088c1e04..5c610b2bcf83 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=1.70.0
-revision=1
+revision=2
_cargo_revision=0.71.0
build_helper=rust
hostmakedepends="cargo-bootstrap rust python3 curl cmake pkg-config zlib-devel"
From b1358dbc561b74458ce3385b4d6157d3d2b4b300 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 11:39:55 +0200
Subject: [PATCH 15/23] cargo-edit: update to 0.12.0
---
srcpkgs/cargo-edit/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index e8cf16b500cb..c6f1015c91a2 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-edit'
pkgname=cargo-edit
-version=0.11.11
+version=0.12.0
revision=1
archs="x86_64* i686* aarch64* arm*" # uses ring
build_style=cargo
-configure_args="--no-default-features -F add,rm,upgrade,set-version"
+configure_args="--no-default-features -F upgrade,set-version"
hostmakedepends="pkg-config"
makedepends="openssl-devel libgit2-devel"
short_desc="Utility for managing cargo dependencies from the command line"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://github.com/killercup/cargo-edit"
changelog="https://raw.githubusercontent.com/killercup/cargo-edit/master/CHANGELOG.md"
distfiles="https://github.com/killercup/cargo-edit/archive/refs/tags/v${version}.tar.gz"
-checksum=9ce140e840498d61c1573ff4206214d0c41c8db24048f0f0f27b7f4464310f9a
+checksum=a8168ea2320c095f55d2b32f8bede8c814dcdc4290c250df36dc8ce0f6fb2095
post_install() {
vlicense LICENSE
From c711d97ef68795c29f158bacd2777a7de2b0eae2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:44:29 +0200
Subject: [PATCH 16/23] exa: rebuild for libgit2
---
srcpkgs/exa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ec5649613174..89bf6611d9fb 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,7 +1,7 @@
# Template file for 'exa'
pkgname=exa
version=0.10.1
-revision=3
+revision=4
create_wrksrc=yes
build_wrksrc="${pkgname}-${version}"
build_style=cargo
From d74888cf61c559395d79b55c82d02a278170f573 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 12:45:07 +0200
Subject: [PATCH 17/23] git-series: rebuild for libgit2
---
srcpkgs/git-series/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 79c561af76b6..365dc53ab02d 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=15
+revision=16
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
@@ -10,7 +10,7 @@ short_desc="Track patch series in git"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/git-series/git-series"
-distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
+distfiles="https://github.com/git-series/git-series/archive/refs/tags/${version}.tar.gz"
checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
post_extract() {
@@ -18,9 +18,11 @@ post_extract() {
cargo update --package url@1.2.3 --precise 1.7.2
cargo update --package openssl-sys@0.9.1 --precise 0.9.60
}
+
pre_build() {
export LIBGIT2_SYS_USE_PKG_CONFIG=yes
}
+
post_install() {
vman git-series.1
vlicense LICENSE.txt
From 97e48097132df4589dc8e9d6b28229687bf2db62 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:00:03 +0200
Subject: [PATCH 18/23] bat: rebuild for libgit2
---
srcpkgs/bat/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/bat/template | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/bat/patches/bump-git2.patch
diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
new file mode 100644
index 000000000000..842b57d4ee6b
--- /dev/null
+++ b/srcpkgs/bat/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 44460e0..78dfbde 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true }
+ bytesize = { version = "1.1.0" }
+
+ [dependencies.git2]
+-version = "0.16"
++version = "0.17"
+ optional = true
+ default-features = false
+
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index c20fc0e09edd..6d6b39fae611 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,7 +1,7 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
@@ -19,7 +19,9 @@ case "$XBPS_TARGET_MACHINE" in
*) ;;
esac
-export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
pre_build() {
export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
From c6398495be4804665fda937651da6ec39fffe9be Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:05:15 +0200
Subject: [PATCH 19/23] cargo-update: rebuild for libgit2
---
srcpkgs/cargo-update/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/cargo-update/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cargo-update/patches/bump-git2.patch
diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch
new file mode 100644
index 000000000000..90a31fbdcb02
--- /dev/null
+++ b/srcpkgs/cargo-update/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index e62e9c8..1aa0658 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -52,7 +52,7 @@ tabwriter = "1.2"
+ lazysort = "0.2"
+ regex = "1.6"
+ serde = "1.0"
+-git2 = "0.16"
++git2 = "0.17"
+ home = "0.5"
+ toml = "0.5"
+ hex = "0.4"
diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index 086d3660bfaa..b411c99f0a7c 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=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config go-md2man"
makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
From dce5bd8268871f992239fc23933079d14868351b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:11:08 +0200
Subject: [PATCH 20/23] cocogitto: rebuild for libgit2
---
srcpkgs/cocogitto/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index dbed47399d80..a4399ef38921 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
version=5.3.1
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -17,6 +17,10 @@ checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
post_install() {
local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
From 34266c8e6d93531d51cd0024585d3b156b1d8b37 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:21:18 +0200
Subject: [PATCH 21/23] delta: rebuild for libgit2
---
srcpkgs/delta/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/delta/template | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/delta/patches/bump-git2.patch
diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch
new file mode 100644
index 000000000000..05255c23c9cc
--- /dev/null
+++ b/srcpkgs/delta/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 8c0c6d8..4fdaa9d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -46,7 +46,7 @@ vte = "0.11.0"
+ xdg = "2.4.1"
+
+ [dependencies.git2]
+-version = "0.16.1"
++version = "0.17"
+ default-features = false
+ features = []
+
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 7904e323b89f..e0e2c44370d7 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,7 +1,7 @@
# Template file for 'delta'
pkgname=delta
version=0.16.5
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
makedepends="libgit2-devel oniguruma-devel"
@@ -13,8 +13,8 @@ homepage="https://github.com/dandavison/delta"
distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
-pre_build() {
- export RUSTONIG_SYSTEM_LIBONIG=1
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
}
post_install() {
From 31c6cf792df71dc9a098c2654a86d373f5018d2d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:25:52 +0200
Subject: [PATCH 22/23] git-absorb: rebuild for libgit2
---
srcpkgs/git-absorb/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/git-absorb/template | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/git-absorb/patches/bump-git2.patch
diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch
new file mode 100644
index 000000000000..bab771ba1be8
--- /dev/null
+++ b/srcpkgs/git-absorb/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 20a0ec5..7b86eed 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ name = "git-absorb"
+ path = "src/main.rs"
+
+ [dependencies.git2]
+-version = "~0.16"
++version = "~0.17"
+ default-features = false
+
+ [dependencies]
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index 9af2b5ca4edb..5f7d34c5fb31 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=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://github.com/tummychow/git-absorb"
distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz"
checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
post_install() {
vlicense LICENSE.md
vman Documentation/git-absorb.1
From fe055aafb376e557d03851d17fd439ae4e6d84af Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 10 Jun 2023 13:39:34 +0200
Subject: [PATCH 23/23] gitui: rebuild for libgit2
---
srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/gitui/template | 7 ++++++-
2 files changed, 19 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 000000000000..e4b5dfc1fad5
--- /dev/null
+++ b/srcpkgs/gitui/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
+index 5ab4da1..f17fbbe 100644
+--- a/asyncgit/Cargo.toml
++++ b/asyncgit/Cargo.toml
+@@ -14,7 +14,7 @@ keywords = ["git"]
+ [dependencies]
+ crossbeam-channel = "0.5"
+ easy-cast = "0.5"
+-git2 = "0.15"
++git2 = "0.17"
+ 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 a97b179e2331..14a6deb5ba43 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,8 +1,9 @@
# Template file for 'gitui'
pkgname=gitui
version=0.22.1
-revision=1
+revision=2
build_style=cargo
+make_check_args="-- --skip components::textinput::tests::test_visualize_newline"
hostmakedepends="pkg-config python3"
makedepends="libxcb-devel libgit2-devel"
short_desc="Blazing fast terminal-ui for git"
@@ -13,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=285e86c136ee7f410fdd52c5284ccf0d19011cc5f7709e5e10bb02f439a218ea
+post_patch() {
+ cargo update --package git2@0.15.0 --precise 0.17.2
+}
+
post_install() {
vlicense LICENSE.md
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: libgit2: update to 1.6.4
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
` (7 preceding siblings ...)
2023-06-10 11:57 ` tranzystorek-io
@ 2023-06-11 11:42 ` classabbyamp
8 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-06-11 11:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]
There's a closed pull request on the void-packages repository
libgit2: update to 1.6.4
https://github.com/void-linux/void-packages/pull/43435
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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] 11+ messages in thread
* [PR PATCH] libgit2: update to 1.6.4
@ 2023-04-16 2:32 zen0bit
0 siblings, 0 replies; 11+ messages in thread
From: zen0bit @ 2023-04-16 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
There is a new pull request by zen0bit against master on the void-packages repository
https://github.com/oSoWoSo/VUR libgit2
https://github.com/void-linux/void-packages/pull/43471
libgit2: update to 1.6.4
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64 glibc)
A patch file from https://github.com/void-linux/void-packages/pull/43471.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-43471.patch --]
[-- Type: text/x-diff, Size: 1597 bytes --]
From 8c8b4b268288597ec6d405dfd69a64d25edf46db Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 16 Apr 2023 04:09:41 +0200
Subject: [PATCH] libgit2: update to 1.6.4
---
common/shlibs | 2 +-
srcpkgs/libgit2/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index df30e9a925c0..ada0fb64a3fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1351,7 +1351,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.5 libgit2-1.5.0_1
+libgit2.so.1.6 libgit2-1.6.4_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/template b/srcpkgs/libgit2/template
index 6fc1c6641b7c..4c6bd6b1cc14 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.1
+version=1.6.4
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -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=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
+checksum=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-11 11:42 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-14 8:40 [PR PATCH] libgit2: update to 1.6.4 tranzystorek-io
2023-04-14 8:44 ` tranzystorek-io
2023-04-14 8:56 ` [PR PATCH] [Updated] " tranzystorek-io
2023-04-14 11:23 ` tranzystorek-io
2023-04-14 21:48 ` tranzystorek-io
2023-04-21 11:17 ` tranzystorek-io
2023-06-09 11:07 ` tranzystorek-io
2023-06-10 11:42 ` tranzystorek-io
2023-06-10 11:57 ` tranzystorek-io
2023-06-11 11:42 ` [PR PATCH] [Closed]: " classabbyamp
2023-04-16 2:32 [PR PATCH] " zen0bit
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).