[arch-commits] Commit in libvirt-python/trunk (PKGBUILD python3.6.patch)

[Felix Yan]

    Date: Monday, December 26, 2016 @ 04:00:08
  Author: felixonmars
Revision: 202540

upgpkg: libvirt-python 2.2.0-2

python 3.6 rebuild

Added:
  libvirt-python/trunk/python3.6.patch
Modified:
  libvirt-python/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 python3.6.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-26 04:00:05 UTC (rev 202539)
+++ PKGBUILD	2016-12-26 04:00:08 UTC (rev 202540)
@@ -5,7 +5,7 @@
 pkgbase=libvirt-python
 pkgname=(libvirt-python libvirt-python3)
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="libvirt python binding"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -14,10 +14,17 @@
 options=('emptydirs')
 install="libvirt-python.install"
 validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F')
-source=("http://libvirt.org/sources/python/libvirt-python-$pkgver.tar.gz"{,.asc})
+source=("http://libvirt.org/sources/python/libvirt-python-$pkgver.tar.gz"{,.asc}
+        python3.6.patch)
 sha256sums=('ba6b2eb3f018275e9720498d7b771959c2d51ebd54f6e956de5055f912afea76'
-            'SKIP')
+            'SKIP'
+            'dee0682e6b1378d7a6ec0fe84a951ce4fa9766b656ef17c54d60455ceba97bf0')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../python3.6.patch
+}
+
 package_libvirt-python() {
   depends=('python2' 'libvirt')
 

Added: python3.6.patch
===================================================================
--- python3.6.patch	                        (rev 0)
+++ python3.6.patch	2016-12-26 04:00:08 UTC (rev 202540)
@@ -0,0 +1,27 @@
+From f5edaf1ba5bc2db38ae0c7f595e17aff9d89dcfa Mon Sep 17 00:00:00 2001
+From: "Daniel P. Berrange" <berrange at redhat.com>
+Date: Wed, 21 Dec 2016 10:35:17 +0000
+Subject: [PATCH] Remove bogus \o escape in regex
+
+One of the regexes has a bogus \o instead of plain 'o'. Somehow
+this magically worked on all versions of python, until 3.6 came
+along and complained
+
+Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
+---
+ generator.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generator.py b/generator.py
+index 730e456..2c3b667 100755
+--- a/generator.py
++++ b/generator.py
+@@ -1091,7 +1091,7 @@ def is_integral_type (name):
+     return not re.search ("^(unsigned)? ?(int|long)$", name) is None
+ 
+ def is_optional_arg(info):
+-    return re.search("^\(?\optional\)?", info) is not None
++    return re.search("^\(?optional\)?", info) is not None
+ # Functions returning lists which need special rules to check for errors
+ # and raise exceptions.
+ functions_list_exception_test = {