From 5ede1c67614aebb2f3086ebe14ba233274933c0e 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 531b3345e230f..23aef923ed71f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1348,7 +1348,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 abdac006f88f82c8b54b53876409b7733e93e0cc 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 5fa4ffb44166079266de0a23b25b19cb1130d244 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 857a77abec3092dbb961dfa30850c6b8af45bae5 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 15:27:46 +0200 Subject: [PATCH 04/25] juCi++: update to 1.8.0 --- srcpkgs/juCi++/template | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 4cb4644663800..43702d828c1d2 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 -_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" -_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" -create_wrksrc=yes +version=1.8.0 +revision=1 +_libclangmm_commit="5611eb3d9e69486f85a431fbaae03c065f62c2d8" +_tiny_commit="aaf6afa48ad8f0ea5f15dc5cb5f53888bf1ff7ac" +build_wrksrc=jucipp-v${version} build_style=cmake hostmakedepends="pkg-config" makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel" @@ -16,9 +16,9 @@ homepage="https://gitlab.com/cppit/jucipp" distfiles="https://gitlab.com/cppit/jucipp/-/archive/v${version}/jucipp-v${version}.tar.gz https://gitlab.com/cppit/libclangmm/-/archive/${_libclangmm_commit}/libclangmm-${_libclangmm_commit}.tar.gz https://gitlab.com/eidheim/tiny-process-library/-/archive/${_tiny_commit}/tiny-process-library-${_tiny_commit}.tar.gz" -checksum="e792ddb95328ab055b0a4b7eb18669b3337648a4a931ee6ede541c2e95a686e9 - 4ed79294cb67ae56a4d72e50c4188c49215df51c8b9a466fc0aeeaab2dbc7a3f - a808e5e3bdb43a04c862da968588ceffb1e46b85a32b430d5e27f243b37f5098" +checksum="f28e5c3fd7b3d92274654c4253667a720cacfcbe06b6f93f2a3111bdabc60cce + 391e1163c5c5981b7c362b0265e95cd78b4414c3c0f011a48c269f08806be12f + 2faf40246f6d8a297b777e1ec7df5e3a060224967a7664de350d6cd42ef08b06" nocross=yes #clang cannot be installed as makedepends when cross compiling case "$XBPS_TARGET_MACHINE" in @@ -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 55c15cf47cbf6d6df658e255606a28fb12c93671 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 16:07:22 +0200 Subject: [PATCH 05/25] 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 e433b9dba5bbd..5020e13a2eac7 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=16 +revision=17 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 9c2337782d249bdaf942bfdf820856a8591ebb8f Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 16:32:04 +0200 Subject: [PATCH 06/25] horizon: update to 2.5.0 --- srcpkgs/horizon/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 1d1b8cf1891c2..97ed737c2c561 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,13 +1,13 @@ # Template file for 'horizon' pkgname=horizon -version=2.4.0 -revision=3 +version=2.5.0 +revision=1 build_style=gnu-makefile make_build_args="GOLD=" make_install_target="install install-man" make_use_env=yes hostmakedepends="pkg-config glib-devel" -makedepends="cairomm-devel librsvg-devel sqlite-devel boost-devel +makedepends="cairomm-devel librsvg-devel sqlite-devel glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel" short_desc="Free EDA package" @@ -16,7 +16,7 @@ license="GPL-3.0-only" homepage="https://horizon-eda.org/" changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md" distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz" -checksum=e1165ec11dc222fd5c41a1da752b2aae44eca80f6f785dd4069dcdd225ae1d53 +checksum=c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4 if [ "$CROSS_BUILD" ]; then make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade" From 55ad12e81445ddb5623defea20ede91e6b88cd64 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:24:28 +0200 Subject: [PATCH 07/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 a7152b385394bcbaf6f6745b45898295d1355598 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:35:31 +0200 Subject: [PATCH 08/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 c5dd9ce10cba8aad189bf41671e0f2019695d29f Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 18:43:42 +0200 Subject: [PATCH 09/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 fae4e004246ce0c0a8b1e7c03173ee2939f12f7d Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:09:16 +0200 Subject: [PATCH 10/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 bb595c6098fc487884042ed9028eae8951be7232 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:16:52 +0200 Subject: [PATCH 11/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 1aacd9d0cec264761a7b8df6b80940c37e1d84d6 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:18:04 +0200 Subject: [PATCH 12/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 76ca96de3982c1dfcb5b08c63629395e8cf08c78 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:23:26 +0200 Subject: [PATCH 13/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 7f4bd83a61fd72de6ce69597dabf68b18f061dbf Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 19:31:30 +0200 Subject: [PATCH 14/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 aada6b289542d86661512e87f85b6b23e99013df Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Tue, 22 Aug 2023 16:46:36 +0200 Subject: [PATCH 15/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 b853d4a89d7d38ba00b9c0656aa3cbabb9f0d582 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 16:14:34 +0200 Subject: [PATCH 16/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..e91ae2b195f3e --- /dev/null +++ b/srcpkgs/cargo/patches/bump-git2.patch @@ -0,0 +1,67 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 55a625a..81afa08 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -987,11 +987,11 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.17.1" ++version = "0.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" ++checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.2.1", + "libc", + "libgit2-sys", + "log", +@@ -1002,9 +1002,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", +@@ -1936,9 +1936,9 @@ checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" + + [[package]] + name = "libgit2-sys" +-version = "0.15.1+1.6.4" ++version = "0.16.1+1.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" ++checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index c45dad5..fdb740f 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.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } + gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] } + glob = "0.3.0" +@@ -51,7 +51,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 1e9dd3d652197..e076a065ee3f8 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=1.71.1 -revision=2 +revision=3 _cargo_revision=0.72.2 build_helper=rust hostmakedepends="cargo-bootstrap rust python3 curl pkg-config zlib-devel" From 5b714bfcbfb60990ae8ab350a1cba89e47a562db Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 16:29:28 +0200 Subject: [PATCH 17/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 5b9e597994e36b2af42be4111349e6691a1f1fc3 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:09:09 +0200 Subject: [PATCH 18/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 dfc796d60d5034673f9ee443dd74ad64735e5f4b Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:14:39 +0200 Subject: [PATCH 19/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 90b8cfc47f2c170641d7c46dde314cf58bd9a798 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:22:12 +0200 Subject: [PATCH 20/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 07cb4b115db21feedd185dc93a60849f546804ba 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 096d1beb0b4b3f2812413225bdfcede63a7dafc0 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 5c56ae07e33031e28e5049201db3fadba4b9fe89 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 9a48a447916a2ba2743620ea9c5917e4481cc672 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 8 Sep 2023 17:54:49 +0200 Subject: [PATCH 24/25] gitui: update to 0.24.2 --- srcpkgs/gitui/patches/bump-git2.patch | 13 +++++++++++++ srcpkgs/gitui/template | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) 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 0baff743d5d2f..792f22aaa43b4 100644 --- a/srcpkgs/gitui/template +++ b/srcpkgs/gitui/template @@ -1,7 +1,7 @@ # Template file for 'gitui' pkgname=gitui -version=0.23.0 -revision=2 +version=0.24.2 +revision=1 build_style=cargo make_check_args="-- --skip components::textinput::tests::test_visualize_newline" hostmakedepends="pkg-config python3" @@ -12,7 +12,11 @@ license="MIT" homepage="https://github.com/extrawurst/gitui" changelog="https://github.com/extrawurst/gitui/raw/master/CHANGELOG.md" distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz" -checksum=5180d5d8fd2fe6400148d6078b4b318c7530ca6c27ea8d8c0882f2e4d9064a80 +checksum=f8a0a4b3117a40d5fcfe29618d350027bebe3fbcee39f0aef85cb9a5325453b7 + +post_patch() { + cargo update --package git2@0.17.2 --precise 0.18.0 +} post_install() { vlicense LICENSE.md From 78696d3c709feeb134dc6c5295995dbc2754a659 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() {