From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/
Date: Sat, 3 Aug 2019 09:28:21 +0000 (UTC) [thread overview]
Message-ID: <1564824487.8b9a5153b00803bc29cd6809f3d7725d0589f3c0.alexxy@gentoo> (raw)
commit: 8b9a5153b00803bc29cd6809f3d7725d0589f3c0
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Mon Jul 29 06:58:00 2019 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 09:28:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9a5153
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 <AT> 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 <AT> gentoo.org>
sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 ++++++++++++
.../kicad/{kicad-5.1.0.ebuild => kicad-5.1.0-r1.ebuild} | 1 +
.../kicad/{kicad-5.1.2.ebuild => kicad-5.1.2-r1.ebuild} | 1 +
3 files changed, 14 insertions(+)
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
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 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
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 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() {
next reply other threads:[~2019-08-03 9:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-03 9:28 Alexey Shvetsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 20:15 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/ Sam James
2024-03-27 11:41 Yixun Lan
2023-07-18 19:15 Sam James
2023-02-18 10:46 Matthew Smith
2023-01-30 4:01 Sam James
2022-06-21 20:44 Sam James
2020-09-25 20:22 Michał Górny
2020-06-06 17:47 Alexey Shvetsov
2020-05-14 10:36 Alexey Shvetsov
2019-12-17 18:14 Joonas Niilola
2019-04-07 16:53 Alexey Shvetsov
2019-01-02 16:51 Amy Liffey
2018-09-27 13:37 Virgil Dupras
2018-09-07 12:03 Virgil Dupras
2016-04-13 7:29 Ian Delaney
2015-11-01 4:23 Ian Delaney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1564824487.8b9a5153b00803bc29cd6809f3d7725d0589f3c0.alexxy@gentoo \
--to=alexxy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox