From d0c97b9e947177eb7869bc80d66610388460181c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:00:53 +0200 Subject: [PATCH 01/25] libgit2: update to 1.7.1 --- common/shlibs | 2 +- .../patches/fix-missing-oid-type.patch | 24 ------------------- srcpkgs/libgit2/template | 8 +++---- 3 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/libgit2/patches/fix-missing-oid-type.patch diff --git a/common/shlibs b/common/shlibs index d2791c238eada..86f15b0875e0b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1347,7 +1347,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.1_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/fix-missing-oid-type.patch b/srcpkgs/libgit2/patches/fix-missing-oid-type.patch deleted file mode 100644 index 8d24809f244a1..0000000000000 --- 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 035b2cebae821..c73d550f11321 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,9 +1,9 @@ # Template file for 'libgit2' pkgname=libgit2 -version=1.6.4 -revision=2 +version=1.7.1 +revision=1 build_style=cmake -configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON" +configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system" hostmakedepends="python3 pkg-config" makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel" short_desc="Git linkable library" @@ -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=d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d +checksum=17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON" From c5608f9811f802a4710fc0c0ab560bc66f5d1622 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 15:40:22 +0200 Subject: [PATCH 02/25] python3-pygit2: update to 1.13.0 --- srcpkgs/python3-pygit2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template index b8db662c7715a..16e5da6b281d5 100644 --- a/srcpkgs/python3-pygit2/template +++ b/srcpkgs/python3-pygit2/template @@ -1,6 +1,6 @@ # Template file for 'python3-pygit2' pkgname=python3-pygit2 -version=1.12.1 +version=1.13.0 revision=1 build_style=python3-pep517 hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel" @@ -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=6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8 From 3006a03501cba639f0e533be99d42771082c0075 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:06:27 +0200 Subject: [PATCH 03/25] 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 f20b53b73211c..358f81b03d780 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=4 +revision=5 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false) From ccfeaf36c39dccbf46c0fcdf44e483964295106c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Sep 2023 10:39:09 +0200 Subject: [PATCH 04/25] juCi++: rebuild for libgit2-1.7 --- srcpkgs/juCi++/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 4cb4644663800..cac95cb09f1d0 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,10 +1,10 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.7.2 -revision=6 +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 clang 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 45c39840fc340b8ce1af587f76fb84812262e052 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:24:28 +0200 Subject: [PATCH 05/25] 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 51a41c2b02b84..54e0a0cea6dd6 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # Template file for 'justbuild' pkgname=justbuild version=1.2.1 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From e8c606fbf065942846185483ae4546ef1eacb40d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:35:31 +0200 Subject: [PATCH 06/25] 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 b61a1a8c1dfa2..dd3f1dc81df5a 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 baa86184b09a8a6e89965703e38e9b3e47577bf3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 16 Sep 2023 16:43:57 +0200 Subject: [PATCH 07/25] 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 97ed737c2c561..25c6a5196df51 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,7 +1,7 @@ # Template file for 'horizon' pkgname=horizon version=2.5.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="GOLD=" make_install_target="install install-man" From 61dc0ae22b99d2a2451abff57befb8774bb38ca2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:43:42 +0200 Subject: [PATCH 08/25] 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 5bdc29d7ff700..74191baecb95b 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 c7caf8c0e24b4a480d54d1988a7fe1fa32ce2f12 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:09:16 +0200 Subject: [PATCH 09/25] 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 8830b3a61c06b..219ac3d66adef 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=3.8.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config ruby-asciidoctor" From 40ba96689c386b59a53ebc5c156ba112658b9689 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:16:52 +0200 Subject: [PATCH 10/25] 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 77982f8185be2..5614d4aa82eb0 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 8ca3501be8750a0a291001230573d9c8523a4b74 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:18:04 +0200 Subject: [PATCH 11/25] 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 ee27d04171d85..9f0bdb3a8c1e5 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 0938086753762a105c8d7819856af1b045b5a2fa Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:23:26 +0200 Subject: [PATCH 12/25] 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 f0bb0b04ed80b..fec1cd543ac62 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=3 +revision=4 build_style=gnu-configure configure_args="--enable-all-plugins --disable-devhelp --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" From 240a26f77dcb1253ed2e9b2fafc8b779778726a2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:31:30 +0200 Subject: [PATCH 13/25] 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 11cff69fe7fb9..a85de84f5dd0d 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=4 +revision=5 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" From 94f5297d08b93c1fa3a350f3d2dd536c3aaeef63 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 16:46:36 +0200 Subject: [PATCH 14/25] 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 f689f7c7f9d96..c58706eb8bf08 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -57,3 +57,6 @@ export ZSTD_SYS_USE_PKG_CONFIG=1 # onig-sys export RUSTONIG_SYSTEM_LIBONIG=1 + +# libgit2-sys +export LIBGIT2_NO_VENDOR=1 From 6f6138c4a345df362f56e548c0135264256b2ca1 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 16:14:34 +0200 Subject: [PATCH 15/25] cargo: rebuild for libgit2-1.7 --- srcpkgs/cargo/patches/bump-git2.patch | 67 +++++++++++++++++++++++++++ srcpkgs/cargo/template | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cargo/patches/bump-git2.patch diff --git a/srcpkgs/cargo/patches/bump-git2.patch b/srcpkgs/cargo/patches/bump-git2.patch new file mode 100644 index 0000000000000..ca6a8a7286149 --- /dev/null +++ b/srcpkgs/cargo/patches/bump-git2.patch @@ -0,0 +1,67 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a99e115..86911a7 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -997,11 +997,11 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.17.2" ++version = "0.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" ++checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.3.2", + "libc", + "libgit2-sys", + "log", +@@ -1012,9 +1012,9 @@ dependencies = [ + + [[package]] + name = "git2-curl" +-version = "0.18.0" ++version = "0.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f8f8b7432b72928cff76f69e59ed5327f94a52763731e71274960dee72fe5f8c" ++checksum = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3" + dependencies = [ + "curl", + "git2", +@@ -1993,9 +1993,9 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + + [[package]] + name = "libgit2-sys" +-version = "0.15.2+1.6.4" ++version = "0.16.1+1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" ++checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 1b2acd3..d6cf459 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -31,8 +31,8 @@ env_logger = "0.10.0" + filetime = "0.2.9" + flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } + fwdansi = "1.1.0" +-git2 = "0.17.1" +-git2-curl = "0.18.0" ++git2 = "0.18.0" ++git2-curl = "0.19.0" + gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } + gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } + glob = "0.3.0" +@@ -50,7 +50,7 @@ jobserver = "0.1.26" + lazy_static = "1.3.0" + lazycell = "1.2.0" + libc = "0.2.144" +-libgit2-sys = "0.15.1" ++libgit2-sys = "0.16.1" + log = "0.4.17" + memchr = "2.1.3" + miow = "0.5.0" diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index d5213857e7e92..dc99074321c7f 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=1.72.0 -revision=1 +revision=2 _cargo_revision=0.73.1 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" From f1338d4eb795b90dec1ec604cc31eaf62d81fa7e Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 16:29:28 +0200 Subject: [PATCH 16/25] bat: rebuild for libgit2-1.7 --- srcpkgs/bat/patches/bump-git2.patch | 4 ++-- srcpkgs/bat/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch index 842b57d4ee6b3..46da66839ecf8 100644 --- a/srcpkgs/bat/patches/bump-git2.patch +++ b/srcpkgs/bat/patches/bump-git2.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.toml b/Cargo.toml -index 44460e0..78dfbde 100644 +index 44460e0..794fc50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true } @@ -7,7 +7,7 @@ index 44460e0..78dfbde 100644 [dependencies.git2] -version = "0.16" -+version = "0.17" ++version = "0.18" optional = true default-features = false diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index 6d6b39fae611d..09c30682ecc45 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,7 +1,7 @@ # Template file for 'bat' pkgname=bat version=0.23.0 -revision=2 +revision=3 build_style=cargo hostmakedepends="cmake llvm clang pkg-config" makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel" @@ -20,7 +20,7 @@ case "$XBPS_TARGET_MACHINE" in esac post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.16.1 --precise 0.18.0 } pre_build() { From e728aecda15dce0e9e76a9cb3a1ba7be9e8452a5 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:09:09 +0200 Subject: [PATCH 17/25] cargo-update: rebuild for libgit2-1.7 --- srcpkgs/cargo-update/patches/bump-git2.patch | 4 ++-- srcpkgs/cargo-update/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cargo-update/patches/bump-git2.patch b/srcpkgs/cargo-update/patches/bump-git2.patch index 90a31fbdcb02c..e11ebe6ed11df 100644 --- a/srcpkgs/cargo-update/patches/bump-git2.patch +++ b/srcpkgs/cargo-update/patches/bump-git2.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.toml b/Cargo.toml -index e62e9c8..1aa0658 100644 +index e62e9c8..ade0e58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ tabwriter = "1.2" @@ -7,7 +7,7 @@ index e62e9c8..1aa0658 100644 regex = "1.6" serde = "1.0" -git2 = "0.16" -+git2 = "0.17" ++git2 = "0.18" home = "0.5" toml = "0.5" hex = "0.4" diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template index d8347b989882f..90ef50ae22d33 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=3 +revision=4 build_style=cargo hostmakedepends="pkg-config go-md2man" makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel" From ad4f5ba704093963418d3228db09792dae775bb8 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:14:39 +0200 Subject: [PATCH 18/25] cocogitto: rebuild for libgit2-1.7 --- srcpkgs/cocogitto/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template index 5f3e962216af8..da1ff563c68d4 100644 --- a/srcpkgs/cocogitto/template +++ b/srcpkgs/cocogitto/template @@ -1,7 +1,7 @@ # Template file for 'cocogitto' pkgname=cocogitto version=5.5.0 -revision=1 +revision=2 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" @@ -18,7 +18,7 @@ checksum=709c54c6c64463af607590ac970dc5a45cbcc0236a5a15d609d9a77461f11325 make_check=no post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.16.1 --precise 0.18.0 } post_install() { From 7e677885494d5049cb99b540dc549834a9913a45 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:22:12 +0200 Subject: [PATCH 19/25] delta: rebuild for libgit2-1.7 --- srcpkgs/delta/patches/bump-git2.patch | 4 ++-- srcpkgs/delta/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/bump-git2.patch index 05255c23c9ccb..c670fe74abb6c 100644 --- a/srcpkgs/delta/patches/bump-git2.patch +++ b/srcpkgs/delta/patches/bump-git2.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.toml b/Cargo.toml -index 8c0c6d8..4fdaa9d 100644 +index 8c0c6d8..c14a125 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ vte = "0.11.0" @@ -7,7 +7,7 @@ index 8c0c6d8..4fdaa9d 100644 [dependencies.git2] -version = "0.16.1" -+version = "0.17" ++version = "0.18" default-features = false features = [] diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template index e0e2c44370d7b..b410308087ec2 100644 --- a/srcpkgs/delta/template +++ b/srcpkgs/delta/template @@ -1,7 +1,7 @@ # Template file for 'delta' pkgname=delta version=0.16.5 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel oniguruma-devel" @@ -14,7 +14,7 @@ distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar. checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.16.1 --precise 0.18.0 } post_install() { From 6a19db1be6594aa03dc906133b2d493eebd4787a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 17 Sep 2023 10:29:54 +0200 Subject: [PATCH 20/25] 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 9f4eb5bee96aa..0000000000000 --- 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 dc1b3839c389b..6ec957062188b 100644 --- a/srcpkgs/eza/template +++ b/srcpkgs/eza/template @@ -1,7 +1,7 @@ # Template file for 'eza' pkgname=eza version=0.12.0 -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=766e754c9f4632b92e4a773ac496dee8b6b83fdc9b8ed9514750058039fc5a83 -post_patch() { - cargo update --package git2@0.18.0 --precise 0.17.2 -} - post_install() { vcompletion completions/bash/eza bash vcompletion completions/fish/eza.fish fish From de45eaa38adc4c069c968da5ddcba74807c35ede Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:27:24 +0200 Subject: [PATCH 21/25] git-absorb: rebuild for libgit2-1.7 --- srcpkgs/git-absorb/patches/bump-git2.patch | 4 ++-- srcpkgs/git-absorb/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/git-absorb/patches/bump-git2.patch b/srcpkgs/git-absorb/patches/bump-git2.patch index bab771ba1be86..1dc42e8e345e6 100644 --- a/srcpkgs/git-absorb/patches/bump-git2.patch +++ b/srcpkgs/git-absorb/patches/bump-git2.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.toml b/Cargo.toml -index 20a0ec5..7b86eed 100644 +index 20a0ec5..2b3482b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ name = "git-absorb" @@ -7,7 +7,7 @@ index 20a0ec5..7b86eed 100644 [dependencies.git2] -version = "~0.16" -+version = "~0.17" ++version = "~0.18" default-features = false [dependencies] diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template index 8c6dd52ebf277..266c7505387e4 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=2 +revision=3 build_style=cargo build_helper=qemu hostmakedepends="pkg-config" @@ -14,7 +14,7 @@ distfiles="https://github.com/tummychow/git-absorb/archive/refs/tags/${version}. checksum=6cc58d2ae50027a212811faa065623666ccb6e8bd933e801319aaf92b164aa0a post_patch() { - cargo update --package git2@0.16.1 --precise 0.17.2 + cargo update --package git2@0.16.1 --precise 0.18.0 } post_install() { From ed427ff60316d4e38018ee763f75211df33b5060 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:35:46 +0200 Subject: [PATCH 22/25] 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 dd5a3ece05c8e..0000000000000 --- 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 2cab8ec..66b5a8f 100644 ---- a/git-cliff-core/Cargo.toml -+++ b/git-cliff-core/Cargo.toml -@@ -28,7 +28,7 @@ toml = "0.7.6" - lazy-regex = "3.0.1" - - [dependencies.git2] --version = "0.18.0" -+version = "0.17" - default-features = false - optional = true - diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template index c879921e761dd..dbd259be7025e 100644 --- a/srcpkgs/git-cliff/template +++ b/srcpkgs/git-cliff/template @@ -1,7 +1,7 @@ # Template file for 'git-cliff' pkgname=git-cliff version=1.3.0 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo build_helper=qemu @@ -17,10 +17,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=3c130ebbd3121d3994ecd1ff1062220de610c7491ada02f9d421c8869674c386 -post_patch() { - cargo update --package git2@0.18.0 --precise 0.17.2 -} - post_install() { vdoc README.md From 5387f234121d4883bae378cbbcaff4800731010b Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:38:46 +0200 Subject: [PATCH 23/25] 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 fe5e461fcbf25..af9a680b13acd 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 c4c2adb095c8af0edf3df690cbedbdb68f56402c Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:54:49 +0200 Subject: [PATCH 24/25] gitui: rebuild for libgit2-1.7 --- srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++ srcpkgs/gitui/template | 6 +++++- 2 files changed, 18 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 0000000000000..905f593d6e96e --- /dev/null +++ b/srcpkgs/gitui/patches/bump-git2.patch @@ -0,0 +1,13 @@ +diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml +index df03ba1..b405ac9 100644 +--- a/asyncgit/Cargo.toml ++++ b/asyncgit/Cargo.toml +@@ -16,7 +16,7 @@ bitflags = "1" + crossbeam-channel = "0.5" + easy-cast = "0.5" + fuzzy-matcher = "0.3" +-git2 = "0.17" ++git2 = "0.18" + 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 8a04297c2871d..546e479ed8f37 100644 --- a/srcpkgs/gitui/template +++ b/srcpkgs/gitui/template @@ -1,7 +1,7 @@ # Template file for 'gitui' pkgname=gitui version=0.24.3 -revision=1 +revision=2 build_style=cargo make_check_args="-- --skip components::textinput::tests::test_visualize_newline" hostmakedepends="pkg-config python3" @@ -14,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=a5fc6b52a4db0037c3351b9743af49c8bb9ccff4dda5bdb064bab9e59f68fde2 +post_patch() { + cargo update --package git2@0.17.2 --precise 0.18.0 +} + post_install() { vlicense LICENSE.md } From 9935f7727f806b089e1a7318bffdfcc8b561d0d2 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:00:14 +0200 Subject: [PATCH 25/25] 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 54319caba11e9..058c4b684cd72 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 b07f510bff495..a2f790c973017 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.0 } post_install() {