From 7540c44bc13ac61e752cd80577274e6cb42699ff Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 22 Oct 2020 16:24:10 +0000
Subject: py-pygit2: Update to 1.3.0.

Includes a build fix for the updated libgit2 1.1.x, figured it may as well
be updated at the same time.

1.3.0 (2020-09-18)
-------------------------

- New ``Repository.add_submodule(...)``
  `#1011 <https://github.com/libgit2/pygit2/pull/1011>`_

- New ``Repository.applies(...)``
  `#1019 <https://github.com/libgit2/pygit2/pull/1019>`_

- New ``Repository.revparse(...)`` and ``Repository.revparse_ext(...)``
  `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_

- New optional ``flags`` and ``file_flags`` arguments in
  ``Repository.merge_commits`` and ``Repository.merge_trees``
  `#1008 <https://github.com/libgit2/pygit2/pull/1008>`_

- New ``Reference.raw_target``, ``Repository.raw_listall_branches(...)`` and
  ``Repository.raw_listall_references()``; allow bytes in
  ``Repository.lookup_branch(...)`` and ``Repository.diff(...)``
  `#1029 <https://github.com/libgit2/pygit2/pull/1029>`_

- New ``GIT_BLAME_FIRST_PARENT`` and ``GIT_BLAME_USE_MAILMAP`` constants
  `#1031 <https://github.com/libgit2/pygit2/pull/1031>`_

- New ``IndexEntry`` supports ``repr()``, ``str()``, ``==`` and ``!=``
  `#1009 <https://github.com/libgit2/pygit2/pull/1009>`_

- New ``Object`` supports ``repr()``
  `#1022 <https://github.com/libgit2/pygit2/pull/1022>`_

- New accept tuples of strings (not only lists) in a number of places
  `#1025 <https://github.com/libgit2/pygit2/pull/1025>`_

- Fix compatibility with old macOS 10.9
  `#1026 <https://github.com/libgit2/pygit2/issues/1026>`_
  `#1027 <https://github.com/libgit2/pygit2/pull/1027>`_

- Fix check argument type in ``Repository.apply(...)``
  `#1033 <https://github.com/libgit2/pygit2/issues/1033>`_

- Fix raise exception if error in ``Repository.listall_submodules()`` commit 32133974

- Fix a couple of refcount errors in ``OdbBackend.refresh()`` and
  ``Worktree_is_prunable`` commit fed0c19c

- Unit tests
  `#800 <https://github.com/libgit2/pygit2/issues/800>`_
  `#1015 <https://github.com/libgit2/pygit2/pull/1015>`_

- Documentation
  `#705 <https://github.com/libgit2/pygit2/pull/705>`_
---
 devel/py-pygit2/Makefile                  |  4 ++--
 devel/py-pygit2/distinfo                  | 11 ++++++-----
 devel/py-pygit2/patches/patch-src_types.h | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 devel/py-pygit2/patches/patch-src_types.h

diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index 639d19e0256..501527c925c 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2020/05/13 15:00:50 adam Exp $
+# $NetBSD: Makefile,v 1.18 2020/10/22 16:24:10 jperkin Exp $
 
-DISTNAME=	pygit2-1.2.1
+DISTNAME=	pygit2-1.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygit2/}
diff --git a/devel/py-pygit2/distinfo b/devel/py-pygit2/distinfo
index 5539e73265f..db6034af39c 100644
--- a/devel/py-pygit2/distinfo
+++ b/devel/py-pygit2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2020/05/13 15:00:50 adam Exp $
+$NetBSD: distinfo,v 1.14 2020/10/22 16:24:10 jperkin Exp $
 
-SHA1 (pygit2-1.2.1.tar.gz) = b252c9882ddfd54ee8fbdabdb7f0ed796234d460
-RMD160 (pygit2-1.2.1.tar.gz) = c88e15958b4f5c1911c5dea561c2112dcf5d25c3
-SHA512 (pygit2-1.2.1.tar.gz) = 2491892e50d9298d68c2f90b3c4b23c87e51995ccc29e285eb2f868f5e34d2568d5f554818203bf2c735179aeb197e3b7aba1be88e72a6526812e3ee2e0b4348
-Size (pygit2-1.2.1.tar.gz) = 235852 bytes
+SHA1 (pygit2-1.3.0.tar.gz) = 1527df46c38ae6eafd9de2424f8d005953279e51
+RMD160 (pygit2-1.3.0.tar.gz) = 184e2cc6eab30ead8a3744a7ae61f12c565e743b
+SHA512 (pygit2-1.3.0.tar.gz) = 297c6aef27019ca540d7ec9c26da7a5e870a7e5c2e06daa1a038023c4ab32c800b2494970e41a3d576e17e1d2c33402c3116389d9e2ebe1c2def0ba529dbde71
+Size (pygit2-1.3.0.tar.gz) = 243399 bytes
+SHA1 (patch-src_types.h) = 81eca685eb669818d9ad9eb05ff44b874fa04f76
diff --git a/devel/py-pygit2/patches/patch-src_types.h b/devel/py-pygit2/patches/patch-src_types.h
new file mode 100644
index 00000000000..96527a24c63
--- /dev/null
+++ b/devel/py-pygit2/patches/patch-src_types.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_types.h,v 1.1 2020/10/22 16:24:10 jperkin Exp $
+
+Builds and tests fine against libgit2 1.1.x.
+
+--- src/types.h.orig	2020-07-24 11:39:38.000000000 +0000
++++ src/types.h
+@@ -32,10 +32,6 @@
+ #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)
+-#endif
+-
+ /*
+  * Python objects
+  *
-- 
cgit v1.2.3