aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-04-11 02:40:52 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-04-11 03:30:56 +0200
commit42fb708048b3dc3861bc0c9af3d70780b83c0aa7 (patch)
tree1629f37970461c0c263f4441e9b5059a7e8c2ce2 /main
parent2b31b2acf0d98204a2be1ddae2efe524339fac08 (diff)
downloadaports-42fb708048b3dc3861bc0c9af3d70780b83c0aa7.tar.bz2
aports-42fb708048b3dc3861bc0c9af3d70780b83c0aa7.tar.xz
main/libgit2: fix pkgconfig
Diffstat (limited to 'main')
-rw-r--r--main/libgit2/APKBUILD11
-rw-r--r--main/libgit2/pkgconfig-do-not-quote-Libs.patch26
2 files changed, 30 insertions, 7 deletions
diff --git a/main/libgit2/APKBUILD b/main/libgit2/APKBUILD
index c5783d0ce6..269943d067 100644
--- a/main/libgit2/APKBUILD
+++ b/main/libgit2/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libgit2
pkgver=0.25.1
-pkgrel=0
+pkgrel=1
pkgdesc="A linkable library for Git"
url="https://libgit2.github.com/"
arch="all"
@@ -17,8 +17,8 @@ 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
"
-
builddir="$srcdir/$pkgname-$pkgver"
# secfixes:
@@ -48,9 +48,6 @@ package() {
-C "$builddir" install || return 1
}
-md5sums="3b285ce94200f00c34962711f001b192 libgit2-0.25.1.tar.gz
-cbe35a6ce1ae8e87426af0c172fdaafd libressl.patch"
-sha256sums="7ae8e699ff7ff9a1fa702249140ee31ea6fd556bf7968e84e38165870667bcb1 libgit2-0.25.1.tar.gz
-4f9f801c6b50a731d96a2f0f75497b2ae5762ee0be0ef626964c63a50d1c40dc libressl.patch"
sha512sums="bbd0d27c95406b548185ce02e2a9288a9dcb8c3b28476ba20f4f4917f6bd67f1ddee80de3054d30b79cdb9d973c3061a15ea7847c79bfa4e0c62e41d5195cb99 libgit2-0.25.1.tar.gz
-3674957d09207b11d268ba9fcb442a081b8efe318d0e8501b7afa0ae2397efc9aff8572b1ffd9f2286c46a06a647fbe943c2cc7e8f97d1a0288e74010846d439 libressl.patch"
+3674957d09207b11d268ba9fcb442a081b8efe318d0e8501b7afa0ae2397efc9aff8572b1ffd9f2286c46a06a647fbe943c2cc7e8f97d1a0288e74010846d439 libressl.patch
+635fb1f64c4b676044e7800cc8796646f90d7e6447ab77f97b3491f746351e826ffa9c03b6bef7ffabad9c50a5c5e983ea9e53b4972211813f54d81b703b4aed pkgconfig-do-not-quote-Libs.patch"
diff --git a/main/libgit2/pkgconfig-do-not-quote-Libs.patch b/main/libgit2/pkgconfig-do-not-quote-Libs.patch
new file mode 100644
index 0000000000..86133612ed
--- /dev/null
+++ b/main/libgit2/pkgconfig-do-not-quote-Libs.patch
@@ -0,0 +1,26 @@
+From 452ba68cde25423d13ebb36f0a54559f07aa53a2 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenko@redhat.com>
+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
+