[arch-commits] Commit in kicad/trunk (PKGBUILD swig.3.0.10.patch)

[Kyle Keen]

    Date: Wednesday, August 3, 2016 @ 13:40:00
  Author: kkeen
Revision: 184992

upgpkg: kicad 4.0.2-7 glew rebuild and swig fix

Added:
  kicad/trunk/swig.3.0.10.patch
Modified:
  kicad/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   14 +++++++++++---
 swig.3.0.10.patch |   23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-03 13:09:19 UTC (rev 184991)
+++ PKGBUILD	2016-08-03 13:40:00 UTC (rev 184992)
@@ -4,7 +4,7 @@
 
 pkgname=kicad
 pkgver=4.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('i686' 'x86_64')
 #url="http://iut-tice.ujf-grenoble.fr/kicad/"
@@ -15,10 +15,18 @@
 optdepends=('kicad-library: for footprints and symbols'
             'kicad-library-3d: for 3d models of components')
 source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz"
-        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz")
+        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz"
+        "swig.3.0.10.patch")
 md5sums=('6c40f3a511f47c1145ccc75b9c3729f7'
-         '14b17243b11bccc0483efb3743bd0f7b')
+         '14b17243b11bccc0483efb3743bd0f7b'
+         'd57d67f202e19526187dadfda128862f')
 
+prepare() {
+  cd "$srcdir/kicad-$pkgver"
+  # official patch, remove for 4.0.3
+  patch -Np0 -i "$srcdir/swig.3.0.10.patch"
+}
+
 build() {
   cd "$srcdir/kicad-$pkgver"
 

Added: swig.3.0.10.patch
===================================================================
--- swig.3.0.10.patch	                        (rev 0)
+++ swig.3.0.10.patch	2016-08-03 13:40:00 UTC (rev 184992)
@@ -0,0 +1,23 @@
+--- scripting/build_tools/fix_swig_imports.py	2016-02-13 16:14:42.000000000 -0500
++++ scripting/build_tools/fix_swig_imports.py	2016-08-03 01:36:10.110412204 -0400
+@@ -37,7 +37,19 @@
+ txt = ""
+ 
+ for l in lines:
+-    if l.startswith("if version_info >= (2,6,0):"):     # ok with swig version <= 3.0.2
++    if l.startswith("if _swig_python_version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.10
++        l = l.replace("_swig_python_version_info >= (2, 7, 0)","False")
++        doneOk = True
++    elif l.startswith("elif _swig_python_version_info >= (2, 6, 0):"):  # needed with swig version >= 3.0.10
++        l = l.replace("_swig_python_version_info >= (2, 6, 0)","False")
++        doneOk = True
++    if l.startswith("if version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.9
++        l = l.replace("version_info >= (2, 7, 0)","False")
++        doneOk = True
++    elif l.startswith("elif version_info >= (2, 6, 0):"):  # needed with swig version >= 3.0.9
++        l = l.replace("version_info >= (2, 6, 0)","False")
++        doneOk = True
++    elif l.startswith("if version_info >= (2,6,0):"):     # ok with swig version <= 3.0.2
+         l = l.replace("version_info >= (2,6,0)","False")
+         doneOk = True
+     elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig version 3.0.3