From e7339593c35326a99a780da14f4728cec47c5212 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Sat, 18 Aug 2018 21:24:29 -0700 Subject: [PATCH] libgit2: update to 0.27.3. --- common/shlibs | 2 +- .../patches/patch-src_openssl_stream_h.patch | 15 --------------- srcpkgs/libgit2/template | 7 ++++--- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch diff --git a/common/shlibs b/common/shlibs index 5878aa4f33..e60d0eab7e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1278,7 +1278,7 @@ libunwind-arm.so.8 libunwind-1.1_4 libunwind-mips.so.8 libunwind-1.1_4 libunwind-aarch64.so.8 libunwind-1.2rc1_1 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1 -libgit2.so.26 libgit2-0.26.0_1 +libgit2.so.27 libgit2-0.27.3_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/patch-src_openssl_stream_h.patch b/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch deleted file mode 100644 index f5306b96d5..0000000000 --- a/srcpkgs/libgit2/patches/patch-src_openssl_stream_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_openssl_stream_h,v 1.8 2018/03/19 18:28:12 jasper Exp $ - -Index: src/openssl_stream.h ---- src/openssl_stream.h.orig -+++ src/openssl_stream.h -@@ -27,7 +27,8 @@ extern int git_openssl_stream_new(git_stream **out, co - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 9cf918bdfd..ab7297542b 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,17 +1,18 @@ # Template file for 'libgit2' pkgname=libgit2 -version=0.26.6 +version=0.27.3 revision=1 build_style=cmake configure_args="-DTHREADSAFE=ON" hostmakedepends="python git pkg-config" -makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" +makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel libuv libuv-devel" short_desc="The Git linkable library" maintainer="Juan RP " license="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=7669dd47ebdab86ced8888816c552596ec923b6e126704a3445b2081cb0e5662 +checksum=50a57bd91f57aa310fb7d5e2a340b3779dc17e67b4e7e66111feac5c2432f1a5 +configure_args="-DTHREADSAFE=ON" case "$XBPS_TARGET_MACHINE" in *-musl)