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

Jaroslav Lichtblau jlichtblau at archlinux.org
Sun Nov 8 15:37:14 UTC 2020


    Date: Sunday, November 8, 2020 @ 15:37:14
  Author: jlichtblau
Revision: 746606

upgpkg: python-pygit2 1.4.0-1 - new upstream release

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

-----------------------------------+
 PKGBUILD                          |   19 +++++--------------
 python-pygit2-libgit2v1.1.0.patch |   27 ---------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-08 15:36:05 UTC (rev 746605)
+++ PKGBUILD	2020-11-08 15:37:14 UTC (rev 746606)
@@ -3,27 +3,18 @@
 # Contributor: Daniel Micay <danielmicay at gmail.com>
 
 pkgname=python-pygit2
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 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' 'patch')
+makedepends=('python-cffi' 'python-setuptools' 'git' 'python-six')
 checkdepends=('python-pytest-runner')
-source=("$pkgname-$pkgver.tar.gz"::https://github.com/libgit2/pygit2/archive/v$pkgver.tar.gz
-        $pkgname-libgit2v1.1.0.patch)
-sha256sums=('1ffbbbfc2f85694b8f395a616ab930e57b2df9d50781e8ba84603d293ae70462'
-            'd888082802ebff943986909a9716b302780eb7e9c56b73d3cdd3f9b3740125d4')
+source=("$pkgname-$pkgver.tar.gz"::https://github.com/libgit2/pygit2/archive/v$pkgver.tar.gz)
+sha256sums=('d433234582af86b0733f33d27779d24cf2249c09b21f574ce7872b330241420c')
 
-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

Deleted: python-pygit2-libgit2v1.1.0.patch
===================================================================
--- python-pygit2-libgit2v1.1.0.patch	2020-11-08 15:36:05 UTC (rev 746605)
+++ python-pygit2-libgit2v1.1.0.patch	2020-11-08 15:37:14 UTC (rev 746606)
@@ -1,27 +0,0 @@
-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
- 
- /*


More information about the arch-commits mailing list