* Re: [NOMERGE] libgit2: update to 1.3.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
@ 2022-06-23 2:15 ` github-actions
2022-07-08 2:14 ` [PR PATCH] [Closed]: " github-actions
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: github-actions @ 2022-06-23 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/35310#issuecomment-1163847276
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Closed]: [NOMERGE] libgit2: update to 1.3.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
2022-06-23 2:15 ` [NOMERGE] " github-actions
@ 2022-07-08 2:14 ` github-actions
2022-10-09 23:40 ` [PR PATCH] [Updated] " Piraty
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: github-actions @ 2022-07-08 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
There's a closed pull request on the void-packages repository
[NOMERGE] libgit2: update to 1.3.0.
https://github.com/void-linux/void-packages/pull/35310
Description:
bumping libgit2 is required to package [jami](https://git.jami.net/savoirfairelinux/jami-client-qt/)
#### Testing the changes
- I tested the changes in this PR: **NO** (yet)
#### Blocked By
- [ ] https://github.com/void-linux/void-packages/issues/34387)PR: https://github.com/void-linux/void-packages/pull/35270/
- [ ] local build for many archs :(
supersedes:
* https://github.com/void-linux/void-packages/pull/28456/
* https://github.com/void-linux/void-packages/pull/33535
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libgit2: update to 1.3.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
2022-06-23 2:15 ` [NOMERGE] " github-actions
2022-07-08 2:14 ` [PR PATCH] [Closed]: " github-actions
@ 2022-10-09 23:40 ` Piraty
2022-10-13 14:00 ` [PR PATCH] [Updated] [NOMERGE] libgit2: update to 1.5.0 Piraty
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Piraty @ 2022-10-09 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages libgit-1.3.0
https://github.com/void-linux/void-packages/pull/35310
[NOMERGE] libgit2: update to 1.3.0.
bumping libgit2 is required to package [jami](https://git.jami.net/savoirfairelinux/jami-client-qt/)
#### Testing the changes
- I tested the changes in this PR: **NO** (yet)
#### Blocked By
- [ ] https://github.com/void-linux/void-packages/issues/34387)PR: https://github.com/void-linux/void-packages/pull/35270/
- [ ] local build for many archs :(
supersedes:
* https://github.com/void-linux/void-packages/pull/28456/
* https://github.com/void-linux/void-packages/pull/33535
A patch file from https://github.com/void-linux/void-packages/pull/35310.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit-1.3.0-35310.patch --]
[-- Type: text/x-diff, Size: 21486 bytes --]
From 799b5f1d65859ff0172c976ca86056ab21c1a01a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 30 Jan 2022 14:29:53 +0100
Subject: [PATCH 01/15] libgit2: update to 1.5.0.
---
common/shlibs | 2 +-
...-remove-ftrunacte-from-libgit2-tests.patch | 25 +++++++++++++++++++
...test-validate_current_user_ownership.patch | 13 ++++++++++
srcpkgs/libgit2/template | 20 ++++++++++++---
4 files changed, 56 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
create mode 100644 srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
diff --git a/common/shlibs b/common/shlibs
index 9f95ac87a7ea..99c6b5f3d179 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1328,7 +1328,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.0 libgit2-1.0.1_3
+libgit2.so.1.5 libgit2-1.5.0_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
new file mode 100644
index 000000000000..b084896b4e65
--- /dev/null
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -0,0 +1,25 @@
+From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
+From: Peter Pettersson <boretrk@hotmail.com>
+Date: Thu, 14 Jul 2022 18:28:58 +0200
+Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
+
+---
+ tests/libgit2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
+index 27f421ad6..7f6fafe77 100644
+--- 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)
+ add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
+ add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
+--
+2.38.0
+
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 000000000000..1365d1c1489b
--- /dev/null
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path.c b/tests/util/path.c
+index 2c39e0887..71a8d6040 100644
+--- a/tests/util/path.c
++++ b/tests/util/path.c
+@@ -757,7 +757,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_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 142d5d122fc9..0253f5c9c727 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,8 +1,9 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.0.1
-revision=3
+version=1.5.0
+revision=1
build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 git pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
@@ -10,7 +11,20 @@ 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/v${version}.tar.gz"
-checksum=1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2
+checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=ON"
+else
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
post_install() {
vlicense COPYING
From 338746dd6b8ba21a0646736150c207f0230f648e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:00 +0200
Subject: [PATCH 02/15] DarkRadiant: rebuild for libgit2-1.5.0
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 233d7d270b4a..f3d17865b93c 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.14.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From 3b6a858e7d6fad1c7dac0fc2026fb5d78e7ce2c5 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 03/15] Fritzing: rebuild for libgit2-1.5.0
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index d97ab1654a52..c0436d6506d0 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=5
+revision=6
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
wrksrc="fritzing-app-${version}"
build_style=qmake
From d13561c17142678972108a9a285eeeeb2c8efeda Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 04/15] calligra: rebuild for libgit2-1.5.0
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 6f924d62f8ff..ba3d66ea745a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=8
+revision=9
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 44102c4aa1f3f8fd940bd1c3e54101465101cb0b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 05/15] geany-plugins: rebuild for libgit2-1.5.0
---
...ebar-Simplify-libgit2-version-checks.patch | 49 +++++++
...hangebar-Add-support-for-libgit2-1.4.patch | 124 ++++++++++++++++++
srcpkgs/geany-plugins/template | 2 +-
3 files changed, 174 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
create mode 100644 srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
diff --git a/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
new file mode 100644
index 000000000000..29d3ef78fd90
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
@@ -0,0 +1,49 @@
+From 668f5d07eef16e227402eab09141c738b315d94b Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:11:20 +0200
+Subject: [PATCH 1/2] git-changebar: Simplify libgit2 version checks
+
+Introduce a custom macro for libgit2 version checks for them to be both
+easier to read and write.
+---
+ git-changebar/src/gcb-plugin.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index f8ce20cd..bee8c865 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -32,11 +32,19 @@
+ #include <geany.h>
+ #include <document.h>
+
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
++#ifdef LIBGIT2_VER_MINOR
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) \
++ ((LIBGIT2_VER_MAJOR == (MAJOR) && LIBGIT2_VER_MINOR >= (MINOR)) || \
++ LIBGIT2_VER_MAJOR > (MAJOR))
++#else /* ! defined(LIBGIT2_VER_MINOR) */
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) 0
++#endif
++
++#if ! CHECK_LIBGIT2_VERSION(0, 22)
+ # define git_libgit2_init git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
++#if ! CHECK_LIBGIT2_VERSION(0, 23)
+ /* 0.23 added @p binary_cb */
+ # define git_diff_buffers(old_buffer, old_len, old_as_path, \
+ new_buffer, new_len, new_as_path, options, \
+@@ -45,7 +53,7 @@
+ new_buffer, new_len, new_as_path, options, \
+ file_cb, hunk_cb, line_cb, payload)
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
++#if ! CHECK_LIBGIT2_VERSION(0, 28)
+ # define git_buf_dispose git_buf_free
+ # define git_error_last giterr_last
+ #endif
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
new file mode 100644
index 000000000000..3de6e09df7cc
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
@@ -0,0 +1,124 @@
+From 5d9f1bc6d010e6b4c6a21af8a39b90922f89a82c Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:22:59 +0200
+Subject: [PATCH 2/2] git-changebar: Add support for libgit2 1.4
+
+The buffer API changed a lot in libgit2 1.4, so compatibility is a bit
+nastier than one could hope for.
+
+Fixes #1164.
+---
+ git-changebar/src/gcb-plugin.c | 76 ++++++++++++++++++++++++----------
+ 1 file changed, 54 insertions(+), 22 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index bee8c865..76208cd0 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -219,30 +219,19 @@ static const struct {
+ };
+
+
+-/* workaround https://github.com/libgit2/libgit2/pull/3187 */
+-static int
+-gcb_git_buf_grow (git_buf *buf,
+- size_t target_size)
+-{
+- if (buf->asize == 0) {
+- if (target_size == 0) {
+- target_size = buf->size;
+- }
+- if ((target_size & 7) == 0) {
+- target_size++;
+- }
+- }
+- return git_buf_grow (buf, target_size);
+-}
+-#define git_buf_grow gcb_git_buf_grow
+-
+ static void
+ buf_zero (git_buf *buf)
+ {
+ if (buf) {
+ buf->ptr = NULL;
+ buf->size = 0;
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
+ buf->asize = 0;
++#else
++ /* we don't really need this field, but the documentation states that all
++ * fields should be set to 0, so fill it as well */
++ buf->reserved = 0;
++#endif
+ }
+ }
+
+@@ -256,6 +245,52 @@ clear_cached_blob_contents (void)
+ G_blob_contents_tag = 0;
+ }
+
++/* similar to old git_blob_filtered_content() but makes sure the caller owns
++ * the data in the output buffer -- and uses a boolean return */
++static gboolean
++get_blob_contents (git_buf *out,
++ git_blob *blob,
++ const char *as_path,
++ int check_for_binary_data)
++{
++/* libgit2 1.4 changed buffer API quite a bit */
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
++ gboolean success = TRUE;
++
++ if (git_blob_filtered_content (out, blob, as_path,
++ check_for_binary_data) != 0)
++ return FALSE;
++
++ /* Workaround for https://github.com/libgit2/libgit2/pull/3187
++ * We want to own the buffer, which git_buf_grow(buf, 0) was supposed to do,
++ * but there is a corner case where it doesn't do what it should and
++ * truncates the buffer contents, so we fix this manually. */
++ if (out->asize == 0) {
++ size_t target_size = out->size;
++ if ((target_size & 7) == 0) {
++ target_size++;
++ }
++ success = (git_buf_grow (out, target_size) == 0);
++ }
++
++ return success;
++#else /* libgit2 >= 1.4 */
++ /* Here we can assume we will always get a buffer we own (at least as of
++ * 2022-06-05 it is the case), so there's no need for a pendent to the
++ * previous git_buf_grow() shenanigans.
++ * This code path does the same as the older git_blob_filtered_content()
++ * but with non-deprecated API */
++ git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT;
++
++ if (check_for_binary_data)
++ opts.flags |= GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++ else
++ opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++
++ return git_blob_filter(out, blob, as_path, &opts) == 0;
++#endif
++}
++
+ /* get the file blob for @relpath at HEAD */
+ static gboolean
+ repo_get_file_blob_contents (git_repository *repo,
+@@ -279,11 +314,8 @@ repo_get_file_blob_contents (git_repository *repo,
+ git_blob *blob;
+
+ if (git_blob_lookup (&blob, repo, git_tree_entry_id (entry)) == 0) {
+- if (git_blob_filtered_content (contents, blob, relpath,
+- check_for_binary_data) == 0 &&
+- git_buf_grow (contents, 0) == 0) {
+- success = TRUE;
+- }
++ success = get_blob_contents (contents, blob, relpath,
++ check_for_binary_data);
+ git_blob_free (blob);
+ }
+ git_tree_entry_free (entry);
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index af2785771012..c9464a16440d 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=1
+revision=2
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 20bba778bca8762dc55f9154c0f127efde66257b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 06/15] git-absorb: rebuild for libgit2-1.5.0
---
srcpkgs/git-absorb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index c428d4657e77..a54e47c48df7 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.7
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
From 496b5a2feb655c46dcf2e04ff4a61ed2beec1653 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 07/15] git-series: rebuild for libgit2-1.5.0
---
srcpkgs/git-series/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 53795ed697e7..6c7dc54af0c7 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=13
+revision=14
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
From 3ff47aeadbcfdc8cc0f05d48fcec6802c1e67ff9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 08/15] gnome-builder: rebuild for libgit2-1.5.0
---
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 159f9dfd2bfb..387d05aab1d8 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=42.1
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 3cf835ea6538ddcc1a22f690783a13683b30191d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 09/15] horizon: rebuild for libgit2-1.5.0
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7496696147c9..287bf6afde3e 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.3.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 898bb754d4630a899c821b89fa90a11762f04072 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 10/15] juCi++: rebuild for libgit2-1.5.0
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 6f3474154e27..340b89f624b1 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=3
+revision=4
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 5d108cee2be414d872431c9e73463287c0f64f04 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 11/15] julia: rebuild for libgit2-1.5.0
---
srcpkgs/julia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 576b5beb9bf0..9587254f4a0c 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
# Template file for 'julia'
pkgname=julia
version=1.6.1
-revision=1
+revision=2
archs="i686* x86_64* armv7l* aarch64*"
build_style=gnu-makefile
make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share
From bc803e2fb80c688ead736f7fb60f1022a802a77b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 12/15] kup: rebuild for libgit2-1.5.0
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 15196942dbba..7ae6c1039399 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From 4ea9ea1acb0a0b75a1893cd6b208c73a30fd8371 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 13/15] libgit2-glib: rebuild for libgit2-1.5.0
---
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 b3e87f3ff83b..509f09a751a8 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.0.0.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 847a81fa816eeb8a9c2fbd3eba10204c1a127510 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 14/15] slcp: rebuild for libgit2-1.5.0
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 1873bcc6f233..6dd88ee79c66 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=12
+revision=13
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From b9bdaa03bf3f89d34094359e121ce87ed54d056c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 15/15] stagit: rebuild for libgit2-1.5.0
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7e78e61ac80d..6b7ff8959060 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.1
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libgit2: update to 1.5.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
` (2 preceding siblings ...)
2022-10-09 23:40 ` [PR PATCH] [Updated] " Piraty
@ 2022-10-13 14:00 ` Piraty
2022-10-14 14:06 ` [PR PATCH] [Updated] " Piraty
2022-10-14 19:47 ` [PR PATCH] [Merged]: " Piraty
5 siblings, 0 replies; 7+ messages in thread
From: Piraty @ 2022-10-13 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 708 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages libgit-1.3.0
https://github.com/void-linux/void-packages/pull/35310
[NOMERGE] libgit2: update to 1.5.0.
bumping libgit2 is required to package [jami](https://git.jami.net/savoirfairelinux/jami-client-qt/)
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Blocked By
- [x] #39919
- [ ] local build for many archs :(
supersedes:
* https://github.com/void-linux/void-packages/pull/28456/
* https://github.com/void-linux/void-packages/pull/33535
A patch file from https://github.com/void-linux/void-packages/pull/35310.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit-1.3.0-35310.patch --]
[-- Type: text/x-diff, Size: 20809 bytes --]
From 34694be8aaaf0ae16dab1caf7dd152e1cf8714d8 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 30 Jan 2022 14:29:53 +0100
Subject: [PATCH 01/14] libgit2: update to 1.5.0.
---
common/shlibs | 2 +-
...-remove-ftrunacte-from-libgit2-tests.patch | 25 +++++++++++++++++++
...test-validate_current_user_ownership.patch | 13 ++++++++++
srcpkgs/libgit2/template | 20 ++++++++++++---
4 files changed, 56 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
create mode 100644 srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
diff --git a/common/shlibs b/common/shlibs
index fe70a5765f50..a3505d76c734 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1328,7 +1328,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.0 libgit2-1.0.1_3
+libgit2.so.1.5 libgit2-1.5.0_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
new file mode 100644
index 000000000000..b084896b4e65
--- /dev/null
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -0,0 +1,25 @@
+From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
+From: Peter Pettersson <boretrk@hotmail.com>
+Date: Thu, 14 Jul 2022 18:28:58 +0200
+Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
+
+---
+ tests/libgit2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
+index 27f421ad6..7f6fafe77 100644
+--- 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)
+ add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
+ add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
+--
+2.38.0
+
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 000000000000..1365d1c1489b
--- /dev/null
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path.c b/tests/util/path.c
+index 2c39e0887..71a8d6040 100644
+--- a/tests/util/path.c
++++ b/tests/util/path.c
+@@ -757,7 +757,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_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 142d5d122fc9..0253f5c9c727 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,8 +1,9 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.0.1
-revision=3
+version=1.5.0
+revision=1
build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 git pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
@@ -10,7 +11,20 @@ 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/v${version}.tar.gz"
-checksum=1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2
+checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=ON"
+else
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
post_install() {
vlicense COPYING
From 7f107e255fb695ca93129bfe220f8c0c5e1948dd Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:00 +0200
Subject: [PATCH 02/14] DarkRadiant: rebuild for libgit2-1.5.0
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 233d7d270b4a..f3d17865b93c 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.14.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From beb13708a412c9e248652809315a9761b02e1b17 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 03/14] Fritzing: rebuild for libgit2-1.5.0
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index d97ab1654a52..c0436d6506d0 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=5
+revision=6
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
wrksrc="fritzing-app-${version}"
build_style=qmake
From 45e8cc1034207d384476a943efe2419b3030fa65 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 04/14] calligra: rebuild for libgit2-1.5.0
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 6f924d62f8ff..ba3d66ea745a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=8
+revision=9
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 317ace23280b904e855d19f6b933bd70d8e2a0ea Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 05/14] geany-plugins: rebuild for libgit2-1.5.0
---
...ebar-Simplify-libgit2-version-checks.patch | 49 +++++++
...hangebar-Add-support-for-libgit2-1.4.patch | 124 ++++++++++++++++++
srcpkgs/geany-plugins/template | 2 +-
3 files changed, 174 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
create mode 100644 srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
diff --git a/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
new file mode 100644
index 000000000000..29d3ef78fd90
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
@@ -0,0 +1,49 @@
+From 668f5d07eef16e227402eab09141c738b315d94b Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:11:20 +0200
+Subject: [PATCH 1/2] git-changebar: Simplify libgit2 version checks
+
+Introduce a custom macro for libgit2 version checks for them to be both
+easier to read and write.
+---
+ git-changebar/src/gcb-plugin.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index f8ce20cd..bee8c865 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -32,11 +32,19 @@
+ #include <geany.h>
+ #include <document.h>
+
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
++#ifdef LIBGIT2_VER_MINOR
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) \
++ ((LIBGIT2_VER_MAJOR == (MAJOR) && LIBGIT2_VER_MINOR >= (MINOR)) || \
++ LIBGIT2_VER_MAJOR > (MAJOR))
++#else /* ! defined(LIBGIT2_VER_MINOR) */
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) 0
++#endif
++
++#if ! CHECK_LIBGIT2_VERSION(0, 22)
+ # define git_libgit2_init git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
++#if ! CHECK_LIBGIT2_VERSION(0, 23)
+ /* 0.23 added @p binary_cb */
+ # define git_diff_buffers(old_buffer, old_len, old_as_path, \
+ new_buffer, new_len, new_as_path, options, \
+@@ -45,7 +53,7 @@
+ new_buffer, new_len, new_as_path, options, \
+ file_cb, hunk_cb, line_cb, payload)
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
++#if ! CHECK_LIBGIT2_VERSION(0, 28)
+ # define git_buf_dispose git_buf_free
+ # define git_error_last giterr_last
+ #endif
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
new file mode 100644
index 000000000000..3de6e09df7cc
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
@@ -0,0 +1,124 @@
+From 5d9f1bc6d010e6b4c6a21af8a39b90922f89a82c Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:22:59 +0200
+Subject: [PATCH 2/2] git-changebar: Add support for libgit2 1.4
+
+The buffer API changed a lot in libgit2 1.4, so compatibility is a bit
+nastier than one could hope for.
+
+Fixes #1164.
+---
+ git-changebar/src/gcb-plugin.c | 76 ++++++++++++++++++++++++----------
+ 1 file changed, 54 insertions(+), 22 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index bee8c865..76208cd0 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -219,30 +219,19 @@ static const struct {
+ };
+
+
+-/* workaround https://github.com/libgit2/libgit2/pull/3187 */
+-static int
+-gcb_git_buf_grow (git_buf *buf,
+- size_t target_size)
+-{
+- if (buf->asize == 0) {
+- if (target_size == 0) {
+- target_size = buf->size;
+- }
+- if ((target_size & 7) == 0) {
+- target_size++;
+- }
+- }
+- return git_buf_grow (buf, target_size);
+-}
+-#define git_buf_grow gcb_git_buf_grow
+-
+ static void
+ buf_zero (git_buf *buf)
+ {
+ if (buf) {
+ buf->ptr = NULL;
+ buf->size = 0;
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
+ buf->asize = 0;
++#else
++ /* we don't really need this field, but the documentation states that all
++ * fields should be set to 0, so fill it as well */
++ buf->reserved = 0;
++#endif
+ }
+ }
+
+@@ -256,6 +245,52 @@ clear_cached_blob_contents (void)
+ G_blob_contents_tag = 0;
+ }
+
++/* similar to old git_blob_filtered_content() but makes sure the caller owns
++ * the data in the output buffer -- and uses a boolean return */
++static gboolean
++get_blob_contents (git_buf *out,
++ git_blob *blob,
++ const char *as_path,
++ int check_for_binary_data)
++{
++/* libgit2 1.4 changed buffer API quite a bit */
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
++ gboolean success = TRUE;
++
++ if (git_blob_filtered_content (out, blob, as_path,
++ check_for_binary_data) != 0)
++ return FALSE;
++
++ /* Workaround for https://github.com/libgit2/libgit2/pull/3187
++ * We want to own the buffer, which git_buf_grow(buf, 0) was supposed to do,
++ * but there is a corner case where it doesn't do what it should and
++ * truncates the buffer contents, so we fix this manually. */
++ if (out->asize == 0) {
++ size_t target_size = out->size;
++ if ((target_size & 7) == 0) {
++ target_size++;
++ }
++ success = (git_buf_grow (out, target_size) == 0);
++ }
++
++ return success;
++#else /* libgit2 >= 1.4 */
++ /* Here we can assume we will always get a buffer we own (at least as of
++ * 2022-06-05 it is the case), so there's no need for a pendent to the
++ * previous git_buf_grow() shenanigans.
++ * This code path does the same as the older git_blob_filtered_content()
++ * but with non-deprecated API */
++ git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT;
++
++ if (check_for_binary_data)
++ opts.flags |= GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++ else
++ opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++
++ return git_blob_filter(out, blob, as_path, &opts) == 0;
++#endif
++}
++
+ /* get the file blob for @relpath at HEAD */
+ static gboolean
+ repo_get_file_blob_contents (git_repository *repo,
+@@ -279,11 +314,8 @@ repo_get_file_blob_contents (git_repository *repo,
+ git_blob *blob;
+
+ if (git_blob_lookup (&blob, repo, git_tree_entry_id (entry)) == 0) {
+- if (git_blob_filtered_content (contents, blob, relpath,
+- check_for_binary_data) == 0 &&
+- git_buf_grow (contents, 0) == 0) {
+- success = TRUE;
+- }
++ success = get_blob_contents (contents, blob, relpath,
++ check_for_binary_data);
+ git_blob_free (blob);
+ }
+ git_tree_entry_free (entry);
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index af2785771012..c9464a16440d 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=1
+revision=2
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From c5260831ffee517488ac52c73a178c560c9ef55e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 06/14] git-absorb: rebuild for libgit2-1.5.0
---
srcpkgs/git-absorb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index c428d4657e77..a54e47c48df7 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.7
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
From 92012eadf50a9d99cb0b70592e93642e3446a6a3 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 07/14] git-series: rebuild for libgit2-1.5.0
---
srcpkgs/git-series/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 53795ed697e7..6c7dc54af0c7 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=13
+revision=14
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
From dabebdf57918e0eba346c36ef13cffb17f0ea91b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 08/14] gnome-builder: rebuild for libgit2-1.5.0
---
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 159f9dfd2bfb..387d05aab1d8 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=42.1
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From 0af36a5f7297363cab7245f7ac599aae0ff6c191 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 09/14] horizon: rebuild for libgit2-1.5.0
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7496696147c9..287bf6afde3e 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.3.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 0c79715b628ef994df49f2655520713a338f8748 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 10/14] juCi++: rebuild for libgit2-1.5.0
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 6f3474154e27..340b89f624b1 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=3
+revision=4
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 204d7ed0bc0bca2571578569f5be0e9203bfebbb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 11/14] kup: rebuild for libgit2-1.5.0
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 15196942dbba..7ae6c1039399 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From be2274ed41896f4c9883861f80f16c664a3324a1 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2-1.5.0
---
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 7c6e8336df63..ae2b2539435e 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=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 9e6a083385f0fda4f84749fba1fece905f39632e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 13/14] slcp: rebuild for libgit2-1.5.0
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 1873bcc6f233..6dd88ee79c66 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=12
+revision=13
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From 823cb7f49051e3d73ce062fa4850d76710f1c190 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 14/14] stagit: rebuild for libgit2-1.5.0
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7e78e61ac80d..6b7ff8959060 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.1
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] libgit2: update to 1.5.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
` (3 preceding siblings ...)
2022-10-13 14:00 ` [PR PATCH] [Updated] [NOMERGE] libgit2: update to 1.5.0 Piraty
@ 2022-10-14 14:06 ` Piraty
2022-10-14 19:47 ` [PR PATCH] [Merged]: " Piraty
5 siblings, 0 replies; 7+ messages in thread
From: Piraty @ 2022-10-14 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages libgit-1.3.0
https://github.com/void-linux/void-packages/pull/35310
libgit2: update to 1.5.0.
bumping libgit2 is required to package [jami](https://git.jami.net/savoirfairelinux/jami-client-qt/)
#### Testing the changes
- I tested the changes in this PR: **briefly**
- local build for
- [x] x86_64
- [x] x86_64-musl
- [x] i686
- [x] aarch64
- [x] aarch64-musl
- [x] armv7l
- [x] armv7l-musl
- [x] armv6l-musl
#### Blocked By
- [x] #39919
- [x] local build for many archs :(
supersedes:
* https://github.com/void-linux/void-packages/pull/28456/
* https://github.com/void-linux/void-packages/pull/33535
A patch file from https://github.com/void-linux/void-packages/pull/35310.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit-1.3.0-35310.patch --]
[-- Type: text/x-diff, Size: 20809 bytes --]
From 1e416317a95f2bf918a212ebc24fb076bbbe5f23 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 30 Jan 2022 14:29:53 +0100
Subject: [PATCH 01/14] libgit2: update to 1.5.0.
---
common/shlibs | 2 +-
...-remove-ftrunacte-from-libgit2-tests.patch | 25 +++++++++++++++++++
...test-validate_current_user_ownership.patch | 13 ++++++++++
srcpkgs/libgit2/template | 20 ++++++++++++---
4 files changed, 56 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
create mode 100644 srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
diff --git a/common/shlibs b/common/shlibs
index 2c579d7b5a3e..925fea2868d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1328,7 +1328,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.0 libgit2-1.0.1_3
+libgit2.so.1.5 libgit2-1.5.0_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
new file mode 100644
index 000000000000..b084896b4e65
--- /dev/null
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -0,0 +1,25 @@
+From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
+From: Peter Pettersson <boretrk@hotmail.com>
+Date: Thu, 14 Jul 2022 18:28:58 +0200
+Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
+
+---
+ tests/libgit2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
+index 27f421ad6..7f6fafe77 100644
+--- 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)
+ add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
+ add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
+--
+2.38.0
+
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 000000000000..1365d1c1489b
--- /dev/null
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path.c b/tests/util/path.c
+index 2c39e0887..71a8d6040 100644
+--- a/tests/util/path.c
++++ b/tests/util/path.c
+@@ -757,7 +757,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_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 142d5d122fc9..0253f5c9c727 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,8 +1,9 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.0.1
-revision=3
+version=1.5.0
+revision=1
build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
hostmakedepends="python3 git pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
@@ -10,7 +11,20 @@ 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/v${version}.tar.gz"
-checksum=1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2
+checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=ON"
+else
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
post_install() {
vlicense COPYING
From 62c4701dbf9c781e8b4b2c97fd01fb4bcec53f35 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:00 +0200
Subject: [PATCH 02/14] DarkRadiant: rebuild for libgit2-1.5.0
---
srcpkgs/DarkRadiant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template
index 233d7d270b4a..f3d17865b93c 100644
--- a/srcpkgs/DarkRadiant/template
+++ b/srcpkgs/DarkRadiant/template
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=2.14.0
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
From fc2f2225fc65eedb055e52ee2ca5132cebd9de2a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 03/14] Fritzing: rebuild for libgit2-1.5.0
---
srcpkgs/Fritzing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index d97ab1654a52..c0436d6506d0 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,7 +1,7 @@
# Template file for 'Fritzing'
pkgname=Fritzing
version=0.9.3b
-revision=5
+revision=6
_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14
wrksrc="fritzing-app-${version}"
build_style=qmake
From 02d3d12af34be2f5480149466ccc841d10738387 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:01 +0200
Subject: [PATCH 04/14] calligra: rebuild for libgit2-1.5.0
---
srcpkgs/calligra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 6f924d62f8ff..ba3d66ea745a 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
-revision=8
+revision=9
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF"
From 5f4a56fd4015c1acfef53aaa5d2dc0a2843ab66b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 05/14] geany-plugins: rebuild for libgit2-1.5.0
---
...ebar-Simplify-libgit2-version-checks.patch | 49 +++++++
...hangebar-Add-support-for-libgit2-1.4.patch | 124 ++++++++++++++++++
srcpkgs/geany-plugins/template | 2 +-
3 files changed, 174 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
create mode 100644 srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
diff --git a/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
new file mode 100644
index 000000000000..29d3ef78fd90
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0001-git-changebar-Simplify-libgit2-version-checks.patch
@@ -0,0 +1,49 @@
+From 668f5d07eef16e227402eab09141c738b315d94b Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:11:20 +0200
+Subject: [PATCH 1/2] git-changebar: Simplify libgit2 version checks
+
+Introduce a custom macro for libgit2 version checks for them to be both
+easier to read and write.
+---
+ git-changebar/src/gcb-plugin.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index f8ce20cd..bee8c865 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -32,11 +32,19 @@
+ #include <geany.h>
+ #include <document.h>
+
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
++#ifdef LIBGIT2_VER_MINOR
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) \
++ ((LIBGIT2_VER_MAJOR == (MAJOR) && LIBGIT2_VER_MINOR >= (MINOR)) || \
++ LIBGIT2_VER_MAJOR > (MAJOR))
++#else /* ! defined(LIBGIT2_VER_MINOR) */
++# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) 0
++#endif
++
++#if ! CHECK_LIBGIT2_VERSION(0, 22)
+ # define git_libgit2_init git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
++#if ! CHECK_LIBGIT2_VERSION(0, 23)
+ /* 0.23 added @p binary_cb */
+ # define git_diff_buffers(old_buffer, old_len, old_as_path, \
+ new_buffer, new_len, new_as_path, options, \
+@@ -45,7 +53,7 @@
+ new_buffer, new_len, new_as_path, options, \
+ file_cb, hunk_cb, line_cb, payload)
+ #endif
+-#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
++#if ! CHECK_LIBGIT2_VERSION(0, 28)
+ # define git_buf_dispose git_buf_free
+ # define git_error_last giterr_last
+ #endif
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
new file mode 100644
index 000000000000..3de6e09df7cc
--- /dev/null
+++ b/srcpkgs/geany-plugins/patches/0002-git-changebar-Add-support-for-libgit2-1.4.patch
@@ -0,0 +1,124 @@
+From 5d9f1bc6d010e6b4c6a21af8a39b90922f89a82c Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Sun, 5 Jun 2022 23:22:59 +0200
+Subject: [PATCH 2/2] git-changebar: Add support for libgit2 1.4
+
+The buffer API changed a lot in libgit2 1.4, so compatibility is a bit
+nastier than one could hope for.
+
+Fixes #1164.
+---
+ git-changebar/src/gcb-plugin.c | 76 ++++++++++++++++++++++++----------
+ 1 file changed, 54 insertions(+), 22 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index bee8c865..76208cd0 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -219,30 +219,19 @@ static const struct {
+ };
+
+
+-/* workaround https://github.com/libgit2/libgit2/pull/3187 */
+-static int
+-gcb_git_buf_grow (git_buf *buf,
+- size_t target_size)
+-{
+- if (buf->asize == 0) {
+- if (target_size == 0) {
+- target_size = buf->size;
+- }
+- if ((target_size & 7) == 0) {
+- target_size++;
+- }
+- }
+- return git_buf_grow (buf, target_size);
+-}
+-#define git_buf_grow gcb_git_buf_grow
+-
+ static void
+ buf_zero (git_buf *buf)
+ {
+ if (buf) {
+ buf->ptr = NULL;
+ buf->size = 0;
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
+ buf->asize = 0;
++#else
++ /* we don't really need this field, but the documentation states that all
++ * fields should be set to 0, so fill it as well */
++ buf->reserved = 0;
++#endif
+ }
+ }
+
+@@ -256,6 +245,52 @@ clear_cached_blob_contents (void)
+ G_blob_contents_tag = 0;
+ }
+
++/* similar to old git_blob_filtered_content() but makes sure the caller owns
++ * the data in the output buffer -- and uses a boolean return */
++static gboolean
++get_blob_contents (git_buf *out,
++ git_blob *blob,
++ const char *as_path,
++ int check_for_binary_data)
++{
++/* libgit2 1.4 changed buffer API quite a bit */
++#if ! CHECK_LIBGIT2_VERSION(1, 4)
++ gboolean success = TRUE;
++
++ if (git_blob_filtered_content (out, blob, as_path,
++ check_for_binary_data) != 0)
++ return FALSE;
++
++ /* Workaround for https://github.com/libgit2/libgit2/pull/3187
++ * We want to own the buffer, which git_buf_grow(buf, 0) was supposed to do,
++ * but there is a corner case where it doesn't do what it should and
++ * truncates the buffer contents, so we fix this manually. */
++ if (out->asize == 0) {
++ size_t target_size = out->size;
++ if ((target_size & 7) == 0) {
++ target_size++;
++ }
++ success = (git_buf_grow (out, target_size) == 0);
++ }
++
++ return success;
++#else /* libgit2 >= 1.4 */
++ /* Here we can assume we will always get a buffer we own (at least as of
++ * 2022-06-05 it is the case), so there's no need for a pendent to the
++ * previous git_buf_grow() shenanigans.
++ * This code path does the same as the older git_blob_filtered_content()
++ * but with non-deprecated API */
++ git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT;
++
++ if (check_for_binary_data)
++ opts.flags |= GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++ else
++ opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;
++
++ return git_blob_filter(out, blob, as_path, &opts) == 0;
++#endif
++}
++
+ /* get the file blob for @relpath at HEAD */
+ static gboolean
+ repo_get_file_blob_contents (git_repository *repo,
+@@ -279,11 +314,8 @@ repo_get_file_blob_contents (git_repository *repo,
+ git_blob *blob;
+
+ if (git_blob_lookup (&blob, repo, git_tree_entry_id (entry)) == 0) {
+- if (git_blob_filtered_content (contents, blob, relpath,
+- check_for_binary_data) == 0 &&
+- git_buf_grow (contents, 0) == 0) {
+- success = TRUE;
+- }
++ success = get_blob_contents (contents, blob, relpath,
++ check_for_binary_data);
+ git_blob_free (blob);
+ }
+ git_tree_entry_free (entry);
+--
+2.38.0
+
diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template
index af2785771012..c9464a16440d 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=1
+revision=2
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm"
From 93d4f26483d05123b6d1406e70079f92ec88860c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:02 +0200
Subject: [PATCH 06/14] git-absorb: rebuild for libgit2-1.5.0
---
srcpkgs/git-absorb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template
index c428d4657e77..a54e47c48df7 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.7
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
From a8cfd88803bbd4bc21d21c7746afd45bd74f5682 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 07/14] git-series: rebuild for libgit2-1.5.0
---
srcpkgs/git-series/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 53795ed697e7..6c7dc54af0c7 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=13
+revision=14
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
From e9135b742f76d02b505114e3e76f9752f4030048 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:03 +0200
Subject: [PATCH 08/14] gnome-builder: rebuild for libgit2-1.5.0
---
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 159f9dfd2bfb..387d05aab1d8 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=42.1
-revision=1
+revision=2
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
From c6541cdd5d19ea705266c4fe9d0f4ff79fae17c6 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 09/14] horizon: rebuild for libgit2-1.5.0
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7496696147c9..287bf6afde3e 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.3.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 19685cd82610975773a7c9257b475f1cff678c43 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:04 +0200
Subject: [PATCH 10/14] juCi++: rebuild for libgit2-1.5.0
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 6f3474154e27..340b89f624b1 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=3
+revision=4
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 440256af8f0fabef4231e096c9b02d38b98cc863 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 11/14] kup: rebuild for libgit2-1.5.0
---
srcpkgs/kup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 15196942dbba..7ae6c1039399 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,7 +1,7 @@
# Template file for 'kup'
pkgname=kup
version=0.9.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
kpackage gettext kconfig"
From 26d273863c66170628f5283b93de76a938205608 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:05 +0200
Subject: [PATCH 12/14] libgit2-glib: rebuild for libgit2-1.5.0
---
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 7c6e8336df63..ae2b2539435e 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=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From 6ba4bc7502facebb0b087f6dc76049cf8a8e8878 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 13/14] slcp: rebuild for libgit2-1.5.0
---
srcpkgs/slcp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template
index 1873bcc6f233..6dd88ee79c66 100644
--- a/srcpkgs/slcp/template
+++ b/srcpkgs/slcp/template
@@ -1,7 +1,7 @@
# Template file for 'slcp'
pkgname=slcp
version=0.2
-revision=12
+revision=13
build_style=gnu-makefile
makedepends="libgit2-devel"
short_desc="Simple shell prompt written in C"
From f49adff762e2bb3d8a2b140362272c1ae38a6672 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 10 Oct 2022 01:39:06 +0200
Subject: [PATCH 14/14] stagit: rebuild for libgit2-1.5.0
---
srcpkgs/stagit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7e78e61ac80d..6b7ff8959060 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,7 +1,7 @@
# Template file for 'stagit'
pkgname=stagit
version=1.1
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="MANPREFIX=/usr/share/man"
makedepends="libgit2-devel"
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: libgit2: update to 1.5.0.
2022-01-30 13:31 [PR PATCH] libgit2: update to 1.3.0 Piraty
` (4 preceding siblings ...)
2022-10-14 14:06 ` [PR PATCH] [Updated] " Piraty
@ 2022-10-14 19:47 ` Piraty
5 siblings, 0 replies; 7+ messages in thread
From: Piraty @ 2022-10-14 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There's a merged pull request on the void-packages repository
libgit2: update to 1.5.0.
https://github.com/void-linux/void-packages/pull/35310
Description:
bumping libgit2 is required to package [jami](https://git.jami.net/savoirfairelinux/jami-client-qt/)
#### Testing the changes
- I tested the changes in this PR: **briefly**
- local build for
- [x] x86_64
- [x] x86_64-musl
- [x] i686
- [x] aarch64
- [x] aarch64-musl
- [x] armv7l
- [x] armv7l-musl
- [x] armv6l-musl
#### Blocked By
- [x] #39919
- [x] local build for many archs :(
supersedes:
* https://github.com/void-linux/void-packages/pull/28456/
* https://github.com/void-linux/void-packages/pull/33535
^ permalink raw reply [flat|nested] 7+ messages in thread