From 8b9a5153b00803bc29cd6809f3d7725d0589f3c0 Mon Sep 17 00:00:00 2001 From: Zoltan Puskas Date: Sun, 28 Jul 2019 23:58:00 -0700 Subject: [PATCH] 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 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Closes: https://github.com/gentoo/gentoo/pull/12568 Signed-off-by: Alexey Shvetsov --- .../kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 ++++++++++++ .../{kicad-5.1.0.ebuild => kicad-5.1.0-r1.ebuild} | 1 + .../{kicad-5.1.2.ebuild => kicad-5.1.2-r1.ebuild} | 1 + 3 files changed, 14 insertions(+) create mode 100644 sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch rename sci-electronics/kicad/{kicad-5.1.0.ebuild => kicad-5.1.0-r1.ebuild} (98%) rename sci-electronics/kicad/{kicad-5.1.2.ebuild => kicad-5.1.2-r1.ebuild} (98%) 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 000000000000..3ab6677e5e18 --- /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 similarity index 98% rename from sci-electronics/kicad/kicad-5.1.0.ebuild rename to sci-electronics/kicad/kicad-5.1.0-r1.ebuild index 8fca5ececb98..c7eca78142e4 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 similarity index 98% rename from sci-electronics/kicad/kicad-5.1.2.ebuild rename to sci-electronics/kicad/kicad-5.1.2-r1.ebuild index c739de95232c..0505a9fa4368 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() { -- 2.26.2