From 48c334cd6c7b7cfc6e1469a62350233094be6756 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:35:36 +0300 Subject: [PATCH 01/16] libgit2: update to 1.2.0. Updated libgit2 to `v1.2.0`, added patch with PR https://github.com/libgit2/libgit2/pull/6032 of `git_remote_name_is_valid` fix. --- common/shlibs | 2 +- .../extern_git_remote_name_is_valid.patch | 58 +++++++++++++++++++ srcpkgs/libgit2/template | 6 +- 3 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch diff --git a/common/shlibs b/common/shlibs index ce4e4b8de097..a5f9034941ae 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1315,7 +1315,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.0 libgit2-1.0.1_3 +libgit2.so.1.2 libgit2-1.2.0_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/extern_git_remote_name_is_valid.patch b/srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch new file mode 100644 index 000000000000..a84a285da726 --- /dev/null +++ b/srcpkgs/libgit2/patches/extern_git_remote_name_is_valid.patch @@ -0,0 +1,58 @@ +From 27f50a66124054518d5febe984bccad02ee0846b Mon Sep 17 00:00:00 2001 +From: Miguel Arroz <750683+arroz@users.noreply.github.com> +Date: Thu, 2 Sep 2021 18:59:19 -0700 +Subject: [PATCH 1/2] #6028: Check if `threadstate->error_t.message` is not + `git_buf__initbuf` before freeing. + +This follows the same principle as `buffer.c` where the same check is done before freeing the buffer. It fixes the crash described in #6028. +--- + src/threadstate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/threadstate.c b/src/threadstate.c +index 6031e8280..e2c08975f 100644 +--- a/src/threadstate.c ++++ b/src/threadstate.c +@@ -36,7 +36,8 @@ static void threadstate_dispose(git_threadstate *threadstate) + if (!threadstate) + return; + +- git__free(threadstate->error_t.message); ++ if (threadstate->error_t.message != git_buf__initbuf) ++ git__free(threadstate->error_t.message); + threadstate->error_t.message = NULL; + } + +-- +2.33.0 + + +From 62ee779ea4cdd877419571442860a0d29896a59c Mon Sep 17 00:00:00 2001 +From: lhchavez +Date: Sat, 4 Sep 2021 18:01:10 -0700 +Subject: [PATCH 2/2] remote: Mark `git_remote_name_is_valid` as `GIT_EXTERN` + +This change makes `git_remote_name_is_valid` be part of the public +interface of the library. This is needed for other language bindings to +be able to find this symbol (like in git2go, when linking against +libgit2 dynamically). +--- + include/git2/remote.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/git2/remote.h b/include/git2/remote.h +index 1f52fcd94..51a7d1cdc 100644 +--- a/include/git2/remote.h ++++ b/include/git2/remote.h +@@ -971,7 +971,7 @@ GIT_EXTERN(int) git_remote_rename( + * @param remote_name name to be checked. + * @return 0 on success or an error code + */ +-int git_remote_name_is_valid(int *valid, const char *remote_name); ++GIT_EXTERN(int) git_remote_name_is_valid(int *valid, const char *remote_name); + + /** + * Delete an existing persisted remote. +-- +2.33.0 + diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 2722bd6553f7..bac5d513d6c7 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,7 +1,7 @@ # Template file for 'libgit2' pkgname=libgit2 -version=1.0.1 -revision=3 +version=1.2.0 +revision=1 build_style=cmake hostmakedepends="python3 git pkg-config" makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel" @@ -10,7 +10,7 @@ maintainer="q66 " license="custom:GPL-2.0-or-later WITH GCC-exception-2.0" homepage="https://libgit2.org" distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz" -checksum=1775427a6098f441ddbaa5bd4e9b8a043c7401e450ed761e69a415530fea81d2 +checksum=701a5086a968a46f25e631941b99fc23e4755ca2c56f59371ce1d94b9a0cc643 post_install() { vlicense COPYING From a8ac76d8578ea8b29cde58d92ecef8a240966233 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:36:58 +0300 Subject: [PATCH 02/16] DarkRadiant: revbump due to libgit2 update --- srcpkgs/DarkRadiant/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 6741fc8bae37..5badd1b40be0 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=2.13.0 -revision=2 +revision=3 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config ruby-asciidoctor" From 81964edcdb0a59e423a2538884eff56121ce7280 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:38:23 +0300 Subject: [PATCH 03/16] Fritzing: revbump due to libgit2 update --- srcpkgs/Fritzing/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index d97ab1654a52..c0436d6506d0 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,7 +1,7 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=5 +revision=6 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 wrksrc="fritzing-app-${version}" build_style=qmake From 663c05241e5d33c78c34da755cd446a4a9a6e922 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:38:37 +0300 Subject: [PATCH 04/16] calligra: revbump due to libgit2 update --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index fba5f1f16ee5..89d0b1648e9e 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=5 +revision=6 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 306604cc2fae9ec51919bf7b26fd3c6de9bbf2a7 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:38:51 +0300 Subject: [PATCH 05/16] cargo-outdated: revbump due to libgit2 update --- srcpkgs/cargo-outdated/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template index 5105eb05af5f..494af6ac5117 100644 --- a/srcpkgs/cargo-outdated/template +++ b/srcpkgs/cargo-outdated/template @@ -1,7 +1,7 @@ # Template file for 'cargo-outdated' pkgname=cargo-outdated version=0.9.9 -revision=3 +revision=4 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel openssl-devel" From 7ca779994f20f721ccb10e6e28f1414f522f04c0 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:39:03 +0300 Subject: [PATCH 06/16] geany-plugins: revbump due to libgit2 update --- 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 8038f5f3704b..3cba06294b9c 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.37.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp --disable-webhelper --disable-debugger --disable-geanypy --disable-multiterm" From 1e69f2154489431360fe15bbe2305b584981dfe6 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:39:12 +0300 Subject: [PATCH 07/16] git-absorb: revbump due to libgit2 update --- srcpkgs/git-absorb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/git-absorb/template b/srcpkgs/git-absorb/template index fa73d41afbae..b47901f6815e 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.6 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libgit2-devel" From 6c2da9f9652cbea1d8e6e5aec46e2c171acd0a2c Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:39:23 +0300 Subject: [PATCH 08/16] git-series: revbump due to libgit2 update --- 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 53795ed697e7..6c7dc54af0c7 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=13 +revision=14 build_style=cargo hostmakedepends="cmake pkg-config perl" makedepends="libgit2-devel libcurl-devel" From 2bbe98e3dbfa621bb1e3a54a0e65b58fbd11948c Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:39:52 +0300 Subject: [PATCH 09/16] horizon: revbump due to libgit2 update --- srcpkgs/horizon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template index 8615a24596f8..48cc91d2d6bb 100644 --- a/srcpkgs/horizon/template +++ b/srcpkgs/horizon/template @@ -1,7 +1,7 @@ # Template file for 'horizon' pkgname=horizon version=2.1.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="GOLD=" make_install_target="install install-man" From f033de4114ebd905a85c626d9776ac7ce69f9a55 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:39:59 +0300 Subject: [PATCH 10/16] juCi++: revbump due to libgit2 update --- srcpkgs/juCi++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 1a7604b44a00..5103324dec20 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.6.2 -revision=2 +revision=3 _libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590" _tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5" wrksrc="jucipp-v${version}" From 583ff1f2b00a093f5fc753404c6f8b94d14fa54b Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:40:11 +0300 Subject: [PATCH 11/16] julia: revbump due to libgit2 update --- srcpkgs/julia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 576b5beb9bf0..9e6db10215f6 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,7 +1,7 @@ # Template file for 'julia' pkgname=julia version=1.6.1 -revision=1 +revision=2 archs="i686* x86_64* armv7l* aarch64*" build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share @@ -32,7 +32,7 @@ distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/juli checksum=71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f nocross="build system is a mess" # Targets for the vendored symlinks mentioned above -shlib_requires="libgit2.so.1.0 libcurl.so.4 libmpfr.so.6 libgmp.so.10 +shlib_requires="libgit2.so.1.2 libcurl.so.4 libmpfr.so.6 libgmp.so.10 libmbedcrypto.so.3 libmbedtls.so.12 libmbedx509.so.0 libpcre2-8.so.0 libssh2.so.1 libquadmath.so.0 libnghttp2.so.14 libatomic.so.1 libssp.so.0" From 5e489f38b294ca4e82bb235f6d64465ed15e7d1d Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:40:19 +0300 Subject: [PATCH 12/16] ktexteditor: revbump due to libgit2 update --- srcpkgs/ktexteditor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template index 94d3a8058b65..2e4be1f31574 100644 --- a/srcpkgs/ktexteditor/template +++ b/srcpkgs/ktexteditor/template @@ -1,7 +1,7 @@ # Template file for 'ktexteditor' pkgname=ktexteditor version=5.87.0 -revision=1 +revision=2 build_style=cmake configure_args=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson" From c83583227861fcbec8df7cc001e90d0e99a0c1e0 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:40:29 +0300 Subject: [PATCH 13/16] kup: revbump due to libgit2 update --- srcpkgs/kup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template index 461bbcd45f97..de6a0e1d1ec9 100644 --- a/srcpkgs/kup/template +++ b/srcpkgs/kup/template @@ -1,7 +1,7 @@ # Template file for 'kup' pkgname=kup version=0.8.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig" makedepends="cmake qt5-devel kcoreaddons-devel ki18n-devel kio-devel ksolid-devel From a3ba8ae451582b496a0f9f0e605ad1b1303e5a90 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:40:46 +0300 Subject: [PATCH 14/16] slcp: revbump due to libgit2 update --- srcpkgs/slcp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template index 1873bcc6f233..6dd88ee79c66 100644 --- a/srcpkgs/slcp/template +++ b/srcpkgs/slcp/template @@ -1,7 +1,7 @@ # Template file for 'slcp' pkgname=slcp version=0.2 -revision=12 +revision=13 build_style=gnu-makefile makedepends="libgit2-devel" short_desc="Simple shell prompt written in C" From dd62f31420c672d5a2bd00d001e9721c515bbdd7 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 13 Oct 2021 14:40:55 +0300 Subject: [PATCH 15/16] stagit: revbump due to libgit2 update --- srcpkgs/stagit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template index 89c5a8cb177c..c8b80447e90a 100644 --- a/srcpkgs/stagit/template +++ b/srcpkgs/stagit/template @@ -1,7 +1,7 @@ # Template file for 'stagit' pkgname=stagit version=0.9.5 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="libgit2-devel" From 65d2959d3f02f10d19a39ddb04abb5bf61d97313 Mon Sep 17 00:00:00 2001 From: Kirill Date: Tue, 19 Oct 2021 17:08:53 +0300 Subject: [PATCH 16/16] julia: disabled failing tests --- srcpkgs/julia/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 9e6db10215f6..bba56f6f7c16 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -30,6 +30,10 @@ license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz" checksum=71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f +# Checks is disabled due to issues in Unicode testset. +# See discussion for more details: +# https://github.com/void-linux/void-packages/pull/33535#issuecomment-946400216 +make_check=no nocross="build system is a mess" # Targets for the vendored symlinks mentioned above shlib_requires="libgit2.so.1.2 libcurl.so.4 libmpfr.so.6 libgmp.so.10