From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libgit2: update to 1.6.4
Date: Fri, 09 Jun 2023 13:07:18 +0200 [thread overview]
Message-ID: <20230609110718.cbhIteQjGN8mfQfRdgOEkyRVSbxyUOcsXIBzrYz0n54@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43435@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2023-06-09 11:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 8:40 [PR PATCH] " 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 [this message]
2023-06-10 11:42 ` tranzystorek-io
2023-06-10 11:57 ` tranzystorek-io
2023-06-11 11:42 ` [PR PATCH] [Closed]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609110718.cbhIteQjGN8mfQfRdgOEkyRVSbxyUOcsXIBzrYz0n54@z \
--to=tranzystorek-io@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).