Date: Saturday, August 13, 2016 @ 05:05:21 Author: kkeen Revision: 186695
upgpkg: kicad 4.0.3-1 Modified: kicad/trunk/PKGBUILD Deleted: kicad/trunk/swig.3.0.10.patch -------------------+ PKGBUILD | 18 +++++------------- swig.3.0.10.patch | 23 ----------------------- 2 files changed, 5 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-13 04:48:35 UTC (rev 186694) +++ PKGBUILD 2016-08-13 05:05:21 UTC (rev 186695) @@ -3,8 +3,8 @@ # Contributor: Marq Schneider <[email protected]> pkgname=kicad -pkgver=4.0.2 -pkgrel=7 +pkgver=4.0.3 +pkgrel=1 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') #url="http://iut-tice.ujf-grenoble.fr/kicad/"; @@ -15,18 +15,10 @@ 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"; - "swig.3.0.10.patch") -md5sums=('6c40f3a511f47c1145ccc75b9c3729f7' - '14b17243b11bccc0483efb3743bd0f7b' - 'd57d67f202e19526187dadfda128862f') + "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz";) +md5sums=('2691b85b4f1a363116251e004082462d' + '6e883d3c271c1324c5e1af042f6686fa') -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" Deleted: swig.3.0.10.patch =================================================================== --- swig.3.0.10.patch 2016-08-13 04:48:35 UTC (rev 186694) +++ swig.3.0.10.patch 2016-08-13 05:05:21 UTC (rev 186695) @@ -1,23 +0,0 @@ ---- 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
