From 8748f34203f0118c67aea3f00c576bdaf1f776c3 Mon Sep 17 00:00:00 2001 From: Marcin Puc 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 +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 " 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 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 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 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 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 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 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 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 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 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 " license="GPL-2.0-or-later" From 17518f434329dfcce7dda542d8df8387b1e935d8 Mon Sep 17 00:00:00 2001 From: Marcin Puc 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 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 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 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 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 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 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 " 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 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 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 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 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 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 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 }