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

[Lukas Fleischer]

    Date: Sunday, January 11, 2015 @ 18:41:42
  Author: lfleischer
Revision: 125760

upgpkg: python-pygit2 0.21.4-1

* Upstream update.
* Add upstream patch to fix init_repository().

Added:
  python-pygit2/trunk/0001-Fix-data-type-of-options-in-init_repository.patch
Modified:
  python-pygit2/trunk/PKGBUILD

--------------------------------------------------------+
 0001-Fix-data-type-of-options-in-init_repository.patch |   52 +++++++++++++++
 PKGBUILD                                               |   21 ++++--
 2 files changed, 66 insertions(+), 7 deletions(-)

Added: 0001-Fix-data-type-of-options-in-init_repository.patch
===================================================================
--- 0001-Fix-data-type-of-options-in-init_repository.patch	                        (rev 0)
+++ 0001-Fix-data-type-of-options-in-init_repository.patch	2015-01-11 17:41:42 UTC (rev 125760)
@@ -0,0 +1,52 @@
+From 0437eb7b8b184da5b5700b5e0cd96e1f442d331e Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer <info at cryptocrack.de>
+Date: Sat, 10 Jan 2015 20:38:39 +0100
+Subject: [PATCH] Fix data type of options in init_repository()
+
+Initializers for the char * fields of the git_repository_init_options
+structure must be cdata pointers.
+
+Signed-off-by: Lukas Fleischer <info at cryptocrack.de>
+---
+ pygit2/__init__.py | 25 ++++++++++++++++++++-----
+ 1 file changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/pygit2/__init__.py b/pygit2/__init__.py
+index 2674063..995fe6c 100644
+--- a/pygit2/__init__.py
++++ b/pygit2/__init__.py
+@@ -86,11 +86,26 @@ def init_repository(path, bare=False,
+     C.git_repository_init_init_options(options, C.GIT_REPOSITORY_INIT_OPTIONS_VERSION)
+     options.flags = flags
+     options.mode = mode
+-    options.workdir_path = to_bytes(workdir_path)
+-    options.description = to_bytes(description)
+-    options.template_path = to_bytes(template_path)
+-    options.initial_head = to_bytes(initial_head)
+-    options.origin_url = to_bytes(origin_url)
++
++    if workdir_path:
++        workdir_path_ref = ffi.new('char []', to_bytes(workdir_path))
++        options.workdir_path = workdir_path_ref
++
++    if description:
++        description_ref = ffi.new('char []', to_bytes(description))
++        options.description = description_ref
++
++    if template_path:
++        template_path_ref = ffi.new('char []', to_bytes(template_path))
++        options.template_path = template_path_ref
++
++    if initial_head:
++        initial_head_ref = ffi.new('char []', to_bytes(initial_head))
++        options.initial_head = initial_head_ref
++
++    if origin_url:
++        origin_url_ref = ffi.new('char []', to_bytes(origin_url))
++        options.origin_url = origin_url_ref
+ 
+     # Call
+     crepository = ffi.new('git_repository **')
+-- 
+2.2.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-11 16:34:52 UTC (rev 125759)
+++ PKGBUILD	2015-01-11 17:41:42 UTC (rev 125760)
@@ -3,19 +3,26 @@
 
 pkgbase=python-pygit2
 pkgname=(python-pygit2 python2-pygit2)
-pkgver=0.21.1
-pkgrel=2
+pkgver=0.21.4
+pkgrel=1
 pkgdesc='Python bindings for libgit2'
 url="https://github.com/libgit2/pygit2"
 depends=(libgit2)
-makedepends=(python-cffi python2-cffi)
+makedepends=(python-cffi python2-cffi python-setuptools python2-setuptools)
 arch=(i686 x86_64)
 license=('GPL2')
-source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz)
-md5sums=('b453f5483b3da061aa6063916a4b6255')
+source=("https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz"
+        0001-Fix-data-type-of-options-in-init_repository.patch)
+md5sums=('88a91e9e445d4b7a7a514528a7c7db5a'
+         '5ac0dbb060f98031bf5de851f33a1125')
 
+prepare() {
+  cd "pygit2-$pkgver"
+  patch -p1 -i ../0001-Fix-data-type-of-options-in-init_repository.patch
+}
+
 package_python-pygit2() {
-  cd pygit2-$pkgver
+  cd "pygit2-$pkgver"
   depends+=(python python-cffi)
   replaces=(python-libgit2)
   conflicts=(python-libgit2)
@@ -23,7 +30,7 @@
 }
 
 package_python2-pygit2() {
-  cd pygit2-$pkgver
+  cd "pygit2-$pkgver"
   depends+=(python2 python2-cffi)
   replaces=(python2-libgit2)
   conflicts=(python2-libgit2)