[arch-commits] Commit in python-pygit2/repos/community-i686 (4 files)

Jan de Groot jgc at archlinux.org
Wed Mar 4 09:17:42 UTC 2015


    Date: Wednesday, March 4, 2015 @ 10:17:41
  Author: jgc
Revision: 128696

archrelease: copy trunk to community-i686

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

--------------------------------------------------------+
 0001-Fix-data-type-of-options-in-init_repository.patch |  104 +++++++--------
 PKGBUILD                                               |   69 ++++-----
 2 files changed, 83 insertions(+), 90 deletions(-)

Deleted: 0001-Fix-data-type-of-options-in-init_repository.patch
===================================================================
--- 0001-Fix-data-type-of-options-in-init_repository.patch	2015-03-04 08:55:00 UTC (rev 128695)
+++ 0001-Fix-data-type-of-options-in-init_repository.patch	2015-03-04 09:17:41 UTC (rev 128696)
@@ -1,52 +0,0 @@
-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-i686/0001-Fix-data-type-of-options-in-init_repository.patch (from rev 128695, python-pygit2/trunk/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-03-04 09:17:41 UTC (rev 128696)
@@ -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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-04 08:55:00 UTC (rev 128695)
+++ PKGBUILD	2015-03-04 09:17:41 UTC (rev 128696)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Daniel Micay <danielmicay at gmail.com>
-
-pkgbase=python-pygit2
-pkgname=(python-pygit2 python2-pygit2)
-pkgver=0.21.4
-pkgrel=1
-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=("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"
-  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-i686/PKGBUILD (from rev 128695, python-pygit2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-03-04 09:17:41 UTC (rev 128696)
@@ -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=1
+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