aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-11-07 04:03:54 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-11-07 07:28:23 +0000
commit718cfc99ddd841311bb6741824f7f4029c77b87f (patch)
treeded28d2840009d4814a6e29dc2c0934ccb6bc968
parenta4bcd988865247250b85514cbb2aeb1aa5f3c011 (diff)
downloadaports-718cfc99ddd841311bb6741824f7f4029c77b87f.tar.gz
aports-718cfc99ddd841311bb6741824f7f4029c77b87f.tar.bz2
aports-718cfc99ddd841311bb6741824f7f4029c77b87f.tar.xz
community/py3-pygit2: upgrade to 1.4.0
-rw-r--r--community/py3-pygit2/APKBUILD10
-rw-r--r--community/py3-pygit2/libgit-110.patch34
2 files changed, 4 insertions, 40 deletions
diff --git a/community/py3-pygit2/APKBUILD b/community/py3-pygit2/APKBUILD
index 5ffbd5e3c1..fc41923fb5 100644
--- a/community/py3-pygit2/APKBUILD
+++ b/community/py3-pygit2/APKBUILD
@@ -3,8 +3,8 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-pygit2
_pkgname=pygit2
-pkgver=1.3.0
-pkgrel=1
+pkgver=1.4.0
+pkgrel=0
pkgdesc="Python bindings for libgit2"
url="https://github.com/libgit2/pygit2"
arch="all"
@@ -14,7 +14,6 @@ makedepends="python3-dev py3-setuptools libgit2-dev"
checkdepends="py3-pytest py3-hypothesis"
source="https://pypi.io/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz
s390x-patch-context-mark-xfail.patch
- libgit-110.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
@@ -33,6 +32,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="297c6aef27019ca540d7ec9c26da7a5e870a7e5c2e06daa1a038023c4ab32c800b2494970e41a3d576e17e1d2c33402c3116389d9e2ebe1c2def0ba529dbde71 pygit2-1.3.0.tar.gz
-c0e22ae9a50cb727bae87fd2b03c5b71b7aee77b88764133b9d60d78a9903895d80db10c037859cbc9bfc06d251c2ed169b63c06798e70169de2b39b12fa0fc5 s390x-patch-context-mark-xfail.patch
-4feb4274e1459400bfc3bdde3e667cadbbbd9425f084704447a679663665e9c145316443c76e64a1b6eb0b837a5d8e627f232dc511af69909edf612c4e61ac31 libgit-110.patch"
+sha512sums="b6b9d5028fd63593e6ecd869735132edeeb55c1fd97664be5d0d5dac0c25f844ce0d981782fad7f47e54555ab1f7fa5e87d1ad8a76340d81e1f908ad4ea1e35a pygit2-1.4.0.tar.gz
+c0e22ae9a50cb727bae87fd2b03c5b71b7aee77b88764133b9d60d78a9903895d80db10c037859cbc9bfc06d251c2ed169b63c06798e70169de2b39b12fa0fc5 s390x-patch-context-mark-xfail.patch"
diff --git a/community/py3-pygit2/libgit-110.patch b/community/py3-pygit2/libgit-110.patch
deleted file mode 100644
index 6825f1c062..0000000000
--- a/community/py3-pygit2/libgit-110.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b57aa0e889fe07d7b4663d0729a40f4a9ecf5578 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
-Date: Wed, 14 Oct 2020 08:36:08 +0200
-Subject: [PATCH] Upgrade to libgit2 1.1
-
-Fixes #1040
-
-diff --git a/src/pygit2.c b/src/pygit2.c
-index 4e144705..0693a790 100644
---- a/src/pygit2.c
-+++ b/src/pygit2.c
-@@ -590,6 +590,7 @@ PyInit__pygit2(void)
- ADD_CONSTANT_INT(m, GIT_BLAME_TRACK_COPIES_ANY_COMMIT_COPIES)
- ADD_CONSTANT_INT(m, GIT_BLAME_FIRST_PARENT)
- ADD_CONSTANT_INT(m, GIT_BLAME_USE_MAILMAP)
-+ ADD_CONSTANT_INT(m, GIT_BLAME_IGNORE_WHITESPACE)
-
- /* Merge */
- ADD_CONSTANT_INT(m, GIT_MERGE_ANALYSIS_NONE)
-diff --git a/src/types.h b/src/types.h
-index 0f3c8cf9..8ea01d38 100644
---- a/src/types.h
-+++ b/src/types.h
-@@ -32,8 +32,8 @@
- #include <Python.h>
- #include <git2.h>
-
--#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 0)
--#error You need a compatible libgit2 version (1.0.x)
-+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 1)
-+#error You need a compatible libgit2 version (1.1.x)
- #endif
-
- /*