[arch-commits] Commit in python-pygit2/trunk (2 files)

[Jaroslav Lichtblau]

    Date: Friday, October 16, 2020 @ 14:43:17
  Author: jlichtblau
Revision: 724665

upgpkg: python-pygit2 1.3.0-2 - libgit2 1.1.0 rebuild

Added:
  python-pygit2/trunk/python-pygit2-libgit2v1.1.0.patch
Modified:
  python-pygit2/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   17 +++++++++++++----
 python-pygit2-libgit2v1.1.0.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-16 14:43:15 UTC (rev 724664)
+++ PKGBUILD	2020-10-16 14:43:17 UTC (rev 724665)
@@ -4,17 +4,26 @@
 
 pkgname=python-pygit2
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Python bindings for libgit2'
 arch=('x86_64')
 url="https://github.com/libgit2/pygit2"
 license=('GPL2')
 depends=('libgit2>=1:0.27.0' 'python-cffi' 'python-six' 'python-cached-property')
-makedepends=('python-cffi' 'python-setuptools' 'git' 'python-six')
+makedepends=('python-cffi' 'python-setuptools' 'git' 'python-six' 'patch')
 checkdepends=('python-pytest-runner')
-source=("$pkgname-$pkgver.tar.gz"::https://github.com/libgit2/pygit2/archive/v$pkgver.tar.gz)
-sha256sums=('1ffbbbfc2f85694b8f395a616ab930e57b2df9d50781e8ba84603d293ae70462')
+source=("$pkgname-$pkgver.tar.gz"::https://github.com/libgit2/pygit2/archive/v$pkgver.tar.gz
+        $pkgname-libgit2v1.1.0.patch)
+sha256sums=('1ffbbbfc2f85694b8f395a616ab930e57b2df9d50781e8ba84603d293ae70462'
+            'd888082802ebff943986909a9716b302780eb7e9c56b73d3cdd3f9b3740125d4')
 
+prepare() {
+	cd "pygit2-$pkgver"
+# https://github.com/libgit2/pygit2/commit/b57aa0e889fe07d7b4663d0729a40f4a9ecf5578
+    patch -Np1 -i "${srcdir}"/$pkgname-libgit2v1.1.0.patch
+}
+
+
 build() {
 	cd "pygit2-$pkgver"
 	python setup.py build

Added: python-pygit2-libgit2v1.1.0.patch
===================================================================
--- python-pygit2-libgit2v1.1.0.patch	                        (rev 0)
+++ python-pygit2-libgit2v1.1.0.patch	2020-10-16 14:43:17 UTC (rev 724665)
@@ -0,0 +1,27 @@
+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
+ 
+ /*