[arch-commits] Commit in python-pygit2/repos (6 files)

Felix Yan fyan at archlinux.org
Thu Aug 20 09:00:15 UTC 2015


    Date: Thursday, August 20, 2015 @ 11:00:15
  Author: fyan
Revision: 138543

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  python-pygit2/repos/community-staging-i686/
  python-pygit2/repos/community-staging-i686/0001-Fix-data-type-of-options-in-init_repository.patch
    (from rev 138542, python-pygit2/trunk/0001-Fix-data-type-of-options-in-init_repository.patch)
  python-pygit2/repos/community-staging-i686/PKGBUILD
    (from rev 138542, python-pygit2/trunk/PKGBUILD)
  python-pygit2/repos/community-staging-x86_64/
  python-pygit2/repos/community-staging-x86_64/0001-Fix-data-type-of-options-in-init_repository.patch
    (from rev 138542, python-pygit2/trunk/0001-Fix-data-type-of-options-in-init_repository.patch)
  python-pygit2/repos/community-staging-x86_64/PKGBUILD
    (from rev 138542, python-pygit2/trunk/PKGBUILD)

---------------------------------------------------------------------------------+
 community-staging-i686/0001-Fix-data-type-of-options-in-init_repository.patch   |   52 ++++++++++
 community-staging-i686/PKGBUILD                                                 |   31 +++++
 community-staging-x86_64/0001-Fix-data-type-of-options-in-init_repository.patch |   52 ++++++++++
 community-staging-x86_64/PKGBUILD                                               |   31 +++++
 4 files changed, 166 insertions(+)

Copied: python-pygit2/repos/community-staging-i686/0001-Fix-data-type-of-options-in-init_repository.patch (from rev 138542, python-pygit2/trunk/0001-Fix-data-type-of-options-in-init_repository.patch)
===================================================================
--- community-staging-i686/0001-Fix-data-type-of-options-in-init_repository.patch	                        (rev 0)
+++ community-staging-i686/0001-Fix-data-type-of-options-in-init_repository.patch	2015-08-20 09:00:15 UTC (rev 138543)
@@ -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
+

Copied: python-pygit2/repos/community-staging-i686/PKGBUILD (from rev 138542, python-pygit2/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-08-20 09:00:15 UTC (rev 138543)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Daniel Micay <danielmicay at gmail.com>
+
+pkgbase=python-pygit2
+pkgname=(python-pygit2 python2-pygit2)
+pkgver=0.22.0
+pkgrel=9
+pkgdesc='Python bindings for libgit2'
+url="https://github.com/libgit2/pygit2"
+depends=(libgit2)
+makedepends=(python-cffi python2-cffi python-setuptools python2-setuptools)
+arch=(i686 x86_64)
+license=('GPL2')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz")
+md5sums=('a73eaf01c42527db7673d11fb5b37654')
+
+package_python-pygit2() {
+  cd "pygit2-$pkgver"
+  depends+=(python python-cffi)
+  replaces=(python-libgit2)
+  conflicts=(python-libgit2)
+  LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-pygit2() {
+  cd "pygit2-$pkgver"
+  depends+=(python2 python2-cffi)
+  replaces=(python2-libgit2)
+  conflicts=(python2-libgit2)
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}

Copied: python-pygit2/repos/community-staging-x86_64/0001-Fix-data-type-of-options-in-init_repository.patch (from rev 138542, python-pygit2/trunk/0001-Fix-data-type-of-options-in-init_repository.patch)
===================================================================
--- community-staging-x86_64/0001-Fix-data-type-of-options-in-init_repository.patch	                        (rev 0)
+++ community-staging-x86_64/0001-Fix-data-type-of-options-in-init_repository.patch	2015-08-20 09:00:15 UTC (rev 138543)
@@ -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
+

Copied: python-pygit2/repos/community-staging-x86_64/PKGBUILD (from rev 138542, python-pygit2/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-08-20 09:00:15 UTC (rev 138543)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Daniel Micay <danielmicay at gmail.com>
+
+pkgbase=python-pygit2
+pkgname=(python-pygit2 python2-pygit2)
+pkgver=0.22.0
+pkgrel=9
+pkgdesc='Python bindings for libgit2'
+url="https://github.com/libgit2/pygit2"
+depends=(libgit2)
+makedepends=(python-cffi python2-cffi python-setuptools python2-setuptools)
+arch=(i686 x86_64)
+license=('GPL2')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz")
+md5sums=('a73eaf01c42527db7673d11fb5b37654')
+
+package_python-pygit2() {
+  cd "pygit2-$pkgver"
+  depends+=(python python-cffi)
+  replaces=(python-libgit2)
+  conflicts=(python-libgit2)
+  LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
+}
+
+package_python2-pygit2() {
+  cd "pygit2-$pkgver"
+  depends+=(python2 python2-cffi)
+  replaces=(python2-libgit2)
+  conflicts=(python2-libgit2)
+  python2 setup.py install --root="$pkgdir" --optimize=1
+}



More information about the arch-commits mailing list