From 969da091024c1672333aa9267e60cb9b44944125 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:00:53 +0200 Subject: [PATCH 01/27] libgit2: update to 1.7.2 --- common/shlibs | 2 +- .../patches/fix-missing-oid-type.patch | 24 ------------------- srcpkgs/libgit2/template | 4 ++-- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch diff --git a/common/shlibs b/common/shlibs index c39827e7d630a1..69dc940aa66421 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1334,7 +1334,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3 libunwind-setjmp.so.0 libunwind-1.5.0_3 libmicrohttpd.so.12 libmicrohttpd-0.9.73_1 libmicrodns.so.1 libmicrodns-0.2.0_1 -libgit2.so.1.6 libgit2-1.6.4_1 +libgit2.so.1.7 libgit2-1.7.2_1 libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1 libagg.so.2 agg-2.5_1 libzzip-0.so.13 zziplib-0.13.62_1 diff --git a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch deleted file mode 100644 index 8d24809f244a1d..00000000000000 --- a/srcpkgs/libgit2/patches/fix-missing-oid-type.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 47ebf589250159d6a98bd91625aefd2e1383ec26 Mon Sep 17 00:00:00 2001 -From: Oliver Reiche -Date: Wed, 3 May 2023 12:57:06 +0200 -Subject: [PATCH] Fix missing oid type for "fake" repositories - -... otherwise git_tree__parse_raw() will fail to obtain -the correct oid size, which causes the entire parse to fail. ---- - src/libgit2/repository.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libgit2/repository.c b/src/libgit2/repository.c -index 804e436abeb..c45c5855058 100644 ---- a/src/libgit2/repository.c -+++ b/src/libgit2/repository.c -@@ -1152,6 +1152,8 @@ int git_repository_wrap_odb(git_repository **repo_out, git_odb *odb) - repo = repository_alloc(); - GIT_ERROR_CHECK_ALLOC(repo); - -+ repo->oid_type = GIT_OID_DEFAULT; -+ - git_repository_set_odb(repo, odb); - *repo_out = repo; - diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 934338ef7b8963..5c4e1a48a75c7c 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,6 +1,6 @@ # Template file for 'libgit2' pkgname=libgit2 -version=1.6.5 +version=1.7.2 revision=1 build_style=cmake configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="custom:GPL-2.0-or-later WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz" -checksum=0f09dd49e409913c94df00eeb5b54f8b597905071b454c7f614f8c6e1ddb8d75 +checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON" From 599189ff8e3f2cd27eb6edb5b68ddeb30348b7fa Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 15:40:22 +0200 Subject: [PATCH 02/27] python3-pygit2: update to 1.13.3 --- srcpkgs/python3-pygit2/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template index 848b4abcdaae1e..34d2aef6920200 100644 --- a/srcpkgs/python3-pygit2/template +++ b/srcpkgs/python3-pygit2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pygit2' pkgname=python3-pygit2 -version=1.12.1 -revision=2 +version=1.13.3 +revision=1 build_style=python3-pep517 hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel" makedepends="python3-devel libgit2-devel python3-cached-property libssh2-devel @@ -14,4 +14,4 @@ license="LGPL-2.0-only" homepage="https://www.pygit2.org/" changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz" -checksum=8218922abedc88a65d5092308d533ca4c4ed634aec86a3493d3bdf1a25aeeff3 +checksum=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded From 3baf657264fea6453290e5c44b8aaf7ff1d409e8 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:06:27 +0200 Subject: [PATCH 03/27] libgit2-glib: rebuild for libgit2-1.7 --- srcpkgs/libgit2-glib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index cdc0366e2136e6..37a02337da3736 100644 --- a/srcpkgs/libgit2-glib/template +++ b/srcpkgs/libgit2-glib/template @@ -1,7 +1,7 @@ # Template file for 'libgit2-glib' pkgname=libgit2-glib version=1.2.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false) From e80f74b5c47675351bcfbd3c119386ae2d36399c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Sep 2023 15:23:20 +0200 Subject: [PATCH 04/27] calligra: rebuild for libgit2-1.7 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 421700baadd3c6..bb226c8b1a95e6 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=18 +revision=19 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From fffe2a6fd974cee08cce4ebf55eb131e18a1fb25 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Sep 2023 10:39:09 +0200 Subject: [PATCH 05/27] juCi++: rebuild for libgit2-1.7 --- srcpkgs/juCi++/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index fc4d5b8ea2ef37..685e332af9ee22 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -4,7 +4,7 @@ version=1.7.2 revision=7 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" -create_wrksrc=yes +build_wrksrc=jucipp-v${version} build_style=cmake hostmakedepends="pkg-config" makedepends="aspell-devel clang17-devel boost-devel gtksourceviewmm-devel libgit2-devel" @@ -26,10 +26,8 @@ case "$XBPS_TARGET_MACHINE" in esac post_extract() { - mv jucipp-v$version/* . - rmdir lib/libclangmm lib/tiny-process-library - mv libclangmm-${_libclangmm_commit} ${wrksrc}/lib/libclangmm - mv tiny-process-library-${_tiny_commit} lib/tiny-process-library + mv -T libclangmm-${_libclangmm_commit} ${build_wrksrc}/lib/libclangmm + mv -T tiny-process-library-${_tiny_commit} ${build_wrksrc}/lib/tiny-process-library } post_install() { From fa191071040fefe4a16ac106f25c143913ab404e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:24:28 +0200 Subject: [PATCH 06/27] justbuild: rebuild for libgit2-1.7 --- srcpkgs/justbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index d9f6ec63602a7e..e7dac8c18e6cf2 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # Template file for 'justbuild' pkgname=justbuild version=1.2.4 -revision=2 +revision=3 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From 11176bf68a29737e8a5ad93f2968d5525bd97d89 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:35:31 +0200 Subject: [PATCH 07/27] kup: rebuild for libgit2-1.7 --- srcpkgs/kup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template index b61a1a8c1dfa2a..dd3f1dc81df5a8 100644 --- a/srcpkgs/kup/template +++ b/srcpkgs/kup/template @@ -1,7 +1,7 @@ # Template file for 'kup' pkgname=kup version=0.9.1 -revision=3 +revision=4 build_style=cmake hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons kpackage gettext kconfig" From 22f14675e68d5581783f6acb747e4846dd7323b8 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 16 Sep 2023 16:43:57 +0200 Subject: [PATCH 08/27] horizon: rebuild for libgit2-1.7 --- srcpkgs/horizon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 47d681f66d75bd..16bbf70822d672 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,7 +1,7 @@ # Template file for 'horizon' pkgname=horizon version=2.5.0 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="GOLD=" make_install_target="install install-man" From 4814849ae16f500d19efcce5fe251165e51edf07 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:43:42 +0200 Subject: [PATCH 09/27] Fritzing: rebuild for libgit2-1.7 --- srcpkgs/Fritzing/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index 5bdc29d7ff7007..74191baecb95ba 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,7 +1,7 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=7 +revision=8 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 create_wrksrc=yes build_wrksrc="app" From d66df7d42f4d92fc152d1ff72fe0b3ae8083df7f Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:09:16 +0200 Subject: [PATCH 10/27] DarkRadiant: rebuild for libgit2-1.7 --- srcpkgs/DarkRadiant/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 3a4caeccf8bb86..dc2e7dce866a8e 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=3.8.0 -revision=4 +revision=5 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config ruby-asciidoctor" From 84779c1397a7f265d265460db5643937c8900641 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:16:52 +0200 Subject: [PATCH 11/27] slcp: rebuild for libgit2-1.7 --- srcpkgs/slcp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template index 77982f8185be23..5614d4aa82eb03 100644 --- a/srcpkgs/slcp/template +++ b/srcpkgs/slcp/template @@ -1,7 +1,7 @@ # Template file for 'slcp' pkgname=slcp version=0.2 -revision=14 +revision=15 build_style=gnu-makefile makedepends="libgit2-devel" short_desc="Simple shell prompt written in C" From 91d5b9edaee3b7627547382550639815532bd947 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:18:04 +0200 Subject: [PATCH 12/27] stagit: rebuild for libgit2-1.7 --- srcpkgs/stagit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index 5bc0ec404d99ac..a12180fa1e788f 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,7 +1,7 @@ # Template file for 'stagit' pkgname=stagit version=1.2 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="libgit2-devel" From 28081c01bf9ffa805269d1c85a5878d5cdeb0aaa Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:23:26 +0200 Subject: [PATCH 13/27] geany-plugins: rebuild for libgit2-1.7 --- srcpkgs/geany-plugins/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index ce34fcfbaff42b..77692b2af0cfb5 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,7 +1,7 @@ # Template file for 'geany-plugins' pkgname=geany-plugins version=2.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-all-plugins --disable-geniuspaste --disable-updatechecker --disable-debugger" From 882e2c1d1126d275d440b104e69c04e61b43097d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:31:30 +0200 Subject: [PATCH 14/27] gnome-builder: rebuild for libgit2-1.7 --- srcpkgs/gnome-builder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index bb54ba632f495c..04cec19ab234d7 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=45.0 -revision=1 +revision=2 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" From 4a1f1040bd062ed4e9c74e063fc7b7aaad72a6c3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 16:46:36 +0200 Subject: [PATCH 15/27] common/build-helper/rust.sh: force using system libgit2 library --- common/build-helper/rust.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index 22bfd980ba9e3f..df064355f7e00c 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -70,3 +70,6 @@ export LIBSQLITE3_SYS_USE_PKG_CONFIG=1 # jemalloc-sys export JEMALLOC_SYS_WITH_LG_PAGE=16 + +# libgit2-sys +export LIBGIT2_NO_VENDOR=1 From f2b06691a2e189bd456b3f3278efc44b87b090fc Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 30 Nov 2023 10:27:06 +0100 Subject: [PATCH 16/27] cargo: rebuild for libgit2-1.7 --- srcpkgs/cargo/patches/downgrade-git2.patch | 67 ---------------------- srcpkgs/cargo/template | 2 +- 2 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 srcpkgs/cargo/patches/downgrade-git2.patch diff --git a/srcpkgs/cargo/patches/downgrade-git2.patch b/srcpkgs/cargo/patches/downgrade-git2.patch deleted file mode 100644 index c35a90d0ce555b..00000000000000 --- a/srcpkgs/cargo/patches/downgrade-git2.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 36cf880..72aca65 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1025,11 +1025,11 @@ dependencies = [ - - [[package]] - name = "git2" --version = "0.18.1" -+version = "0.17.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" -+checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" - dependencies = [ -- "bitflags 2.4.1", -+ "bitflags 1.3.2", - "libc", - "libgit2-sys", - "log", -@@ -1040,9 +1040,9 @@ dependencies = [ - - [[package]] - name = "git2-curl" --version = "0.19.0" -+version = "0.18.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3" -+checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" - dependencies = [ - "curl", - "git2", -@@ -2065,9 +2065,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - - [[package]] - name = "libgit2-sys" --version = "0.16.1+1.7.1" -+version = "0.15.2+1.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" -+checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" - dependencies = [ - "cc", - "libc", -diff --git a/Cargo.toml b/Cargo.toml -index c07b004..68c45a0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -40,8 +40,8 @@ curl = "0.4.44" - curl-sys = "0.4.70" - filetime = "0.2.22" - flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } --git2 = "0.18.1" --git2-curl = "0.19.0" -+git2 = "0.17.2" -+git2-curl = "0.18.0" - gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } - gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } - glob = "0.3.1" -@@ -58,7 +58,7 @@ itertools = "0.12.0" - jobserver = "0.1.27" - lazycell = "1.3.0" - libc = "0.2.150" --libgit2-sys = "0.16.1" -+libgit2-sys = "0.15.2" - libloading = "0.8.1" - memchr = "2.6.4" - miow = "0.6.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 4ca4a399560370..71c35f0f1ccd6d 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=1.76.0 -revision=1 +revision=2 _cargo_revision=0.77.0 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" From 58f83e51d7164c4bcdc40e1687e84c3668a4e739 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 16:29:28 +0200 Subject: [PATCH 17/27] bat: rebuild for libgit2-1.7 --- srcpkgs/bat/patches/downgrade-git2.patch | 13 ------------- srcpkgs/bat/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/bat/patches/downgrade-git2.patch diff --git a/srcpkgs/bat/patches/downgrade-git2.patch b/srcpkgs/bat/patches/downgrade-git2.patch deleted file mode 100644 index c2289468320690..00000000000000 --- a/srcpkgs/bat/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index e31fbc3..cc4cdf9 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -69,7 +69,7 @@ os_str_bytes = { version = "~6.4", optional = true } - run_script = { version = "^0.10.0", optional = true} - - [dependencies.git2] --version = "0.18" -+version = "0.17" - optional = true - default-features = false - diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index 55ef7ae8fa22a6..a7f31c22a57ae5 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,7 +1,7 @@ # Template file for 'bat' pkgname=bat version=0.24.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel oniguruma-devel" @@ -15,10 +15,6 @@ checksum=907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb export BAT_ASSETS_GEN_DIR="${XBPS_BUILDDIR}/${pkgname}-${version}" -post_patch() { - cargo update --package git2@0.18.0 --precise 0.17.2 -} - post_install() { vlicense LICENSE-MIT vdoc README.md From 889c133023a0edd973ca867fe9c587c0118610af Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:09:09 +0200 Subject: [PATCH 18/27] cargo-update: rebuild for libgit2-1.7 --- srcpkgs/cargo-update/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template index f136b8ce6ad26e..6284cfaaecb0ca 100644 --- a/srcpkgs/cargo-update/template +++ b/srcpkgs/cargo-update/template @@ -1,7 +1,7 @@ # Template file for 'cargo-update' pkgname=cargo-update version=13.3.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config go-md2man" makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel" From f4e21368cf222dc97580f1cbc2fd103f95e46a9a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:14:39 +0200 Subject: [PATCH 19/27] cocogitto: rebuild for libgit2-1.7 --- srcpkgs/cocogitto/patches/downgrade-git2.patch | 13 ------------- srcpkgs/cocogitto/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/cocogitto/patches/downgrade-git2.patch diff --git a/srcpkgs/cocogitto/patches/downgrade-git2.patch b/srcpkgs/cocogitto/patches/downgrade-git2.patch deleted file mode 100644 index f8eee30c536ed3..00000000000000 --- a/srcpkgs/cocogitto/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 2608ea1..b0d3282 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -20,7 +20,7 @@ codegen-units = 1 - panic = "abort" - - [dependencies] --git2 = { version = "0.18.2", default-features = false, features = [] } -+git2 = { version = "0.17", default-features = false, features = [] } - # Do not bump anyhow, (see: https://github.com/dtolnay/anyhow/issues/353) - anyhow = "1.0.75" - colored = "^2" diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template index 9cf450abe47805..44cfee066eccac 100644 --- a/srcpkgs/cocogitto/template +++ b/srcpkgs/cocogitto/template @@ -1,7 +1,7 @@ # Template file for 'cocogitto' pkgname=cocogitto version=6.1.0 -revision=1 +revision=2 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" @@ -17,10 +17,6 @@ checksum=756bc574f311311639723297f3dc793f7494d9b3ae375d6bc3e6e714432d08f0 # Test suite is not atomic, relies on user environment such as git user configuration make_check=no -post_patch() { - cargo update --package git2@0.18.2 --precise 0.17.2 -} - post_install() { local cog="${DESTDIR}/usr/bin/cog" for shell in bash zsh fish; do From 0c9edde9c3c8c90540feb9981ddff3ea23be76de Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:22:12 +0200 Subject: [PATCH 20/27] delta: rebuild for libgit2-1.7 --- srcpkgs/delta/patches/downgrade-git2.patch | 13 ------------- srcpkgs/delta/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/delta/patches/downgrade-git2.patch diff --git a/srcpkgs/delta/patches/downgrade-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch deleted file mode 100644 index 2f1e88ea6e3700..00000000000000 --- a/srcpkgs/delta/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index d55c68e..b80247b 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -57,7 +57,7 @@ clap_complete = "4.4.4" - terminal-colorsaurus = "0.3.1" - - [dependencies.git2] --version = "0.18.2" -+version = "0.17" - default-features = false - features = [] - diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index d32063d2489442..a954706638ab1d 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,7 +1,7 @@ # Template file for 'delta' pkgname=delta version=0.17.0 -revision=1 +revision=2 build_style=cargo build_helper=qemu # https://github.com/dandavison/delta/issues/1637 @@ -16,10 +16,6 @@ homepage="https://github.com/dandavison/delta" distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz" checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714 -post_patch() { - cargo update --package git2@0.18.2 --precise 0.17.2 -} - post_install() { vlicense LICENSE From aefb82890ce091027a9bf1b2e3d90cf24e61b5fe Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Sep 2023 10:29:54 +0200 Subject: [PATCH 21/27] eza: rebuild for libgit2-1.7 --- srcpkgs/eza/patches/downgrade-git2.patch | 13 ------------- srcpkgs/eza/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch deleted file mode 100644 index 9f4eb5bee96aa5..00000000000000 --- a/srcpkgs/eza/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index e6c3e0e..39a34d0 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -59,7 +59,7 @@ default-features = false - features = ["format"] - - [dependencies.git2] --version = "0.18" -+version = "0.17" - optional = true - default-features = false - diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template index ce207b228dc00e..041b96664127dd 100644 --- a/srcpkgs/eza/template +++ b/srcpkgs/eza/template @@ -1,7 +1,7 @@ # Template file for 'eza' pkgname=eza version=0.18.7 -revision=1 +revision=2 build_style=cargo hostmakedepends="pandoc pkg-config" makedepends="libgit2-devel" @@ -13,10 +13,6 @@ changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz" checksum=e712e3ae97ca7ee28e411b8537e20b1efb88b3e052c8053c13d70ae97bae9b61 -post_patch() { - cargo update --package git2@0.18.2 --precise 0.17.2 -} - post_install() { vcompletion completions/bash/eza bash vcompletion completions/fish/eza.fish fish From d28a756d5015c62c11a1627869897ac4d8882c0a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:27:24 +0200 Subject: [PATCH 22/27] git-absorb: rebuild for libgit2-1.7 --- srcpkgs/git-absorb/patches/downgrade-git2.patch | 13 ------------- srcpkgs/git-absorb/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/git-absorb/patches/downgrade-git2.patch diff --git a/srcpkgs/git-absorb/patches/downgrade-git2.patch b/srcpkgs/git-absorb/patches/downgrade-git2.patch deleted file mode 100644 index afcacd4a8df052..00000000000000 --- a/srcpkgs/git-absorb/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 97dc720..85435bc 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -21,7 +21,7 @@ name = "git-absorb" - path = "src/main.rs" - - [dependencies.git2] --version = "~0.18" -+version = "~0.17" - default-features = false - - [dependencies] diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template index dff6ab4145e4ec..7b87f6995f633d 100644 --- a/srcpkgs/git-absorb/template +++ b/srcpkgs/git-absorb/template @@ -1,7 +1,7 @@ # Template file for 'git-absorb' pkgname=git-absorb version=0.6.12 -revision=1 +revision=2 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" @@ -13,10 +13,6 @@ homepage="https://github.com/tummychow/git-absorb" distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}.tar.gz" checksum=88a64712bcb4885a65984359c783e7f16b76fe4ca4ccd339d0c2d83139d0428b -post_patch() { - cargo update --package git2@0.18.1 --precise 0.17.2 -} - post_install() { vlicense LICENSE.md vman Documentation/git-absorb.1 From dc84a6c76ff37cc09ec8d67d48d2a9acbe6d5af9 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:35:46 +0200 Subject: [PATCH 23/27] git-cliff: rebuild for libgit2-1.7 --- srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 ------------- srcpkgs/git-cliff/template | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch deleted file mode 100644 index 258d95adffdb10..00000000000000 --- a/srcpkgs/git-cliff/patches/downgrade-git2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml -index d7611bc..f88a763 100644 ---- a/git-cliff-core/Cargo.toml -+++ b/git-cliff-core/Cargo.toml -@@ -59,7 +59,7 @@ futures = { version = "0.3.30", optional = true } - url = "2.5.0" - - [dependencies.git2] --version = "0.18.2" -+version = "0.17" - default-features = false - optional = true - diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template index cbb5a4852e9cfa..c9f0b362c5132d 100644 --- a/srcpkgs/git-cliff/template +++ b/srcpkgs/git-cliff/template @@ -1,7 +1,7 @@ # Template file for 'git-cliff' pkgname=git-cliff version=2.1.2 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo build_helper=qemu @@ -21,10 +21,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md" distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz" checksum=1c321b180b071ccfa8986931576fc02ca4dbc75dff035e4c663c2cfb8ecd4683 -post_patch() { - cargo update --package git2@0.18.2 --precise 0.17.2 -} - post_install() { vdoc README.md From ed3ff6b3a004e21c3b1a4e0633e50a0301808501 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:38:46 +0200 Subject: [PATCH 24/27] git-series: rebuild for libgit2-1.7 --- srcpkgs/git-series/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template index fe5e461fcbf250..af9a680b13acdc 100644 --- a/srcpkgs/git-series/template +++ b/srcpkgs/git-series/template @@ -1,7 +1,7 @@ # Template file for 'git-series' pkgname=git-series version=0.9.1 -revision=17 +revision=18 build_style=cargo hostmakedepends="cmake pkg-config perl" makedepends="libgit2-devel libcurl-devel" From cd6dd29416f8c3aa434e26ffab809c8b1b7f0fc5 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:54:49 +0200 Subject: [PATCH 25/27] gitui: rebuild for libgit2-1.7 --- srcpkgs/gitui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template index 0709729a0717d8..cff1c1b41934c8 100644 --- a/srcpkgs/gitui/template +++ b/srcpkgs/gitui/template @@ -1,7 +1,7 @@ # Template file for 'gitui' pkgname=gitui version=0.25.1 -revision=1 +revision=2 build_style=cargo configure_args="--no-default-features --features ghemoji,regex-onig,trace-libgit,vendor-openssl" hostmakedepends="pkg-config" From 598f31e09525db44e3897cb07c4645b44fb936df Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 7 Feb 2024 13:30:46 +0100 Subject: [PATCH 26/27] jujutsu: rebuild for libgit2-1.7 --- srcpkgs/jujutsu/template | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/srcpkgs/jujutsu/template b/srcpkgs/jujutsu/template index 6a79d001de34cd..a26cd77a53cd35 100644 --- a/srcpkgs/jujutsu/template +++ b/srcpkgs/jujutsu/template @@ -1,7 +1,7 @@ # Template file for 'jujutsu' pkgname=jujutsu version=0.15.1 -revision=1 +revision=2 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" @@ -15,12 +15,6 @@ distfiles="https://github.com/martinvonz/jj/archive/refs/tags/v${version}.tar.gz checksum=e39f80edaa01da29e86782424d031c38324eabff10c44704781c80fd60c9fb0e conflicts="jj>=0" -pre_configure() { - # Downgrade to use Void system libgit2 1.6 - vsed -i 's/git2 = "0.18.2"/git2 = "0.17.2"/' Cargo.toml - cargo update --package git2@0.18.2 --precise 0.17.2 -} - do_install() { for f in target/*/release/jj; do vbin $f From ba386302b6c09f710bc3c66ee137695f48fb1b75 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:00:14 +0200 Subject: [PATCH 27/27] lsd: rebuild for libgit2-1.7 --- srcpkgs/lsd/patches/bump-git2.patch | 4 ++-- srcpkgs/lsd/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lsd/patches/bump-git2.patch b/srcpkgs/lsd/patches/bump-git2.patch index 54319caba11e90..058c4b684cd72f 100644 --- a/srcpkgs/lsd/patches/bump-git2.patch +++ b/srcpkgs/lsd/patches/bump-git2.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.toml b/Cargo.toml -index 30fa892..460cf13 100644 +index 30fa892..1b0d83b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ vsort = "0.1.0" @@ -7,7 +7,7 @@ index 30fa892..460cf13 100644 [target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies] # if ssl feature is enabled compilation will fail on arm-unknown-linux-gnueabihf and i686-pc-windows-gnu -git2 = { version = "0.16", optional = true, default-features = false } -+git2 = { version = "0.17", optional = true, default-features = false } ++git2 = { version = "0.18", optional = true, default-features = false } [target.'cfg(unix)'.dependencies] users = "0.11.*" diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template index b07f510bff495a..34713e80ba6280 100644 --- a/srcpkgs/lsd/template +++ b/srcpkgs/lsd/template @@ -1,7 +1,7 @@ # Template file for 'lsd' pkgname=lsd version=1.0.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel" @@ -25,7 +25,7 @@ fi export SHELL_COMPLETIONS_DIR="${wrksrc}" post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.16.1 --precise 0.18.1 } post_install() {