summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Puskas <zoltan@sinustrom.info>2019-07-28 23:58:00 -0700
committerAlexey Shvetsov <alexxy@gentoo.org>2019-08-03 12:28:07 +0300
commit8b9a5153b00803bc29cd6809f3d7725d0589f3c0 (patch)
treeecb31069c9dd7a244f5fb2036b221a575ab0071b /sci-electronics/kicad
parentmedia-sound/pulseaudio-ctl: New package (diff)
downloadgentoo-8b9a5153b00803bc29cd6809f3d7725d0589f3c0.tar.gz
gentoo-8b9a5153b00803bc29cd6809f3d7725d0589f3c0.tar.bz2
gentoo-8b9a5153b00803bc29cd6809f3d7725d0589f3c0.zip
sci-electronics/kicad: Fix 5.1.x build issues with swig-4.0.0
Closes: https://bugs.gentoo.org/690146 Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info> Package-Manager: Portage-2.3.69, Repoman-2.3.16 Closes: https://github.com/gentoo/gentoo/pull/12568 Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Diffstat (limited to 'sci-electronics/kicad')
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch12
-rw-r--r--sci-electronics/kicad/kicad-5.1.0-r1.ebuild (renamed from sci-electronics/kicad/kicad-5.1.0.ebuild)1
-rw-r--r--sci-electronics/kicad/kicad-5.1.2-r1.ebuild (renamed from sci-electronics/kicad/kicad-5.1.2.ebuild)1
3 files changed, 14 insertions, 0 deletions
diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
new file mode 100644
index 00000000000..3ab6677e5e1
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
@@ -0,0 +1,12 @@
+--- a/scripting/build_tools/fix_swig_imports.py 2019-04-22 23:14:54.000000000 +0200
++++ b/scripting/build_tools/fix_swig_imports.py 2019-07-18 15:44:24.255754237 +0200
+@@ -40,6 +40,9 @@
+ txt = b""
+
+ for l in lines:
++ if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"): # ok with swig version >= 4.0.0
++ l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False")
++ doneOk = True
+ if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"): # ok with swig version >= 3.0.10
+ l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False")
+ doneOk = True
diff --git a/sci-electronics/kicad/kicad-5.1.0.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 8fca5ececb9..c7eca78142e 100644
--- a/sci-electronics/kicad/kicad-5.1.0.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
PATCHES=(
"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+ "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
)
pkg_setup() {
diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index c739de95232..0505a9fa436 100644
--- a/sci-electronics/kicad/kicad-5.1.2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
PATCHES=(
"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+ "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
)
pkg_setup() {