X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.cmpwn.com (mail.cmpwn.com [45.56.77.53]) by lists.alpinelinux.org (Postfix) with ESMTP id EA0C65C4D61 for ; Thu, 21 Dec 2017 03:37:40 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cmpwn.com; s=cmpwn; t=1513827550; bh=GpxIlLAfmyst6/3MANyFc4fAGlUGM/duCjMgIrYCBBc=; h=From:To:Cc:Subject:Date; b=pDUP0L1AWCjr2icWQ/1ekmXpUleyZTN8xmldYWZgwUYSO/4hGApZvrhx5FazWpglh 1z1z8VPqRaBYZxVGMSceVX6uTgezNbXKZ6vK5BKbFt45HRPLmqvBSBIDrP4AAF3xaz Cc9Hvf7/bIe4NGQiKR99TQ3vp6DIGfiyD1GS2EJc= From: Drew DeVault To: alpine-aports@lists.alpinelinux.org Cc: Drew DeVault Subject: [alpine-aports] [PATCHv2] main/libgit2: upgrade to 0.26.0 Date: Wed, 20 Dec 2017 22:37:35 -0500 Message-Id: <20171221033735.10332-1-sir@cmpwn.com> X-Mailer: git-send-email 2.15.0 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- Sorry for the noise, I forgot to remove the obsolete patches. main/libgit2/APKBUILD | 10 +++------- main/libgit2/libressl.patch | 12 ------------ main/libgit2/pkgconfig-do-not-quote-Libs.patch | 26 -------------------------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 main/libgit2/libressl.patch delete mode 100644 main/libgit2/pkgconfig-do-not-quote-Libs.patch diff --git a/main/libgit2/APKBUILD b/main/libgit2/APKBUILD index 883c92641c..2d5a10ff85 100644 --- a/main/libgit2/APKBUILD +++ b/main/libgit2/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Pierre-Gilas MILLON # Maintainer: Natanael Copa pkgname=libgit2 -pkgver=0.25.1 -pkgrel=4 +pkgver=0.26.0 +pkgrel=0 pkgdesc="A linkable library for Git" url="https://libgit2.github.com/" arch="all" @@ -16,8 +16,6 @@ subpackages="$pkgname-dev" provides="$pkgname-libs" # for backward compatibility with v3.4 replaces="$pkgname-libs" # for backward compatibility with v3.4 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz - libressl.patch - pkgconfig-do-not-quote-Libs.patch build-both-static-dynamic.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -48,7 +46,5 @@ package() { -C "$builddir" install || return 1 } -sha512sums="e20c7f4a55d2183522fd851a002a9e861e2f3b550c09aea7fbcd9eae5c39410596e4cd4f852d81256bb0bee6365eab0f9b854b66fd459afe2b7d149f68c1c103 libgit2-0.25.1.tar.gz -3674957d09207b11d268ba9fcb442a081b8efe318d0e8501b7afa0ae2397efc9aff8572b1ffd9f2286c46a06a647fbe943c2cc7e8f97d1a0288e74010846d439 libressl.patch -635fb1f64c4b676044e7800cc8796646f90d7e6447ab77f97b3491f746351e826ffa9c03b6bef7ffabad9c50a5c5e983ea9e53b4972211813f54d81b703b4aed pkgconfig-do-not-quote-Libs.patch +sha512sums="b6e51f2216c7c23f352572b780ea1325a25a517396709f036bb573295c2bd02aa505ba616846ac7e07863e99e640e7d47fefc5727478a257b283da99060ee47c libgit2-0.26.0.tar.gz 39534d10f38f394446f93df810233464807fca3b0e903ee40067971ecbe1d78102bbe04283435032f757f970e6846ecf279eb727ab137c01e84427bd16913ee6 build-both-static-dynamic.patch" diff --git a/main/libgit2/libressl.patch b/main/libgit2/libressl.patch deleted file mode 100644 index 967cdc4982..0000000000 --- a/main/libgit2/libressl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru src.orig/libgit2-0.25.1/src/openssl_stream.h src/libgit2-0.25.1/src/openssl_stream.h ---- libgit2-0.25.1/src/copenssl_stream.h.orig -+++ libgit2-0.25.1/src/openssl_stream.h -@@ -27,7 +27,7 @@ - - - --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name) - { diff --git a/main/libgit2/pkgconfig-do-not-quote-Libs.patch b/main/libgit2/pkgconfig-do-not-quote-Libs.patch deleted file mode 100644 index 86133612ed..0000000000 --- a/main/libgit2/pkgconfig-do-not-quote-Libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 452ba68cde25423d13ebb36f0a54559f07aa53a2 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Tue, 7 Feb 2017 16:37:47 +0100 -Subject: [PATCH] pkgconfig: do not quote Libs - -It doesn't make sense at all. ---- - libgit2.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgit2.pc.in b/libgit2.pc.in -index 329a560a7..880266a30 100644 ---- a/libgit2.pc.in -+++ b/libgit2.pc.in -@@ -6,7 +6,7 @@ Name: libgit2 - Description: The git library, take 2 - Version: @LIBGIT2_VERSION_STRING@ - --Libs: -L"${libdir}" -lgit2 -+Libs: -L${libdir} -lgit2 - Libs.private: @LIBGIT2_PC_LIBS@ - Requires.private: @LIBGIT2_PC_REQUIRES@ - --- -2.11.0 - -- 2.15.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---