Hello community,
here is the log from the commit of package kicad for openSUSE:Factory checked
in at 2016-07-12 23:52:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kicad (Old)
and /work/SRC/openSUSE:Factory/.kicad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kicad/kicad.changes 2016-05-10
09:27:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kicad.new/kicad.changes 2016-07-12
23:52:11.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 7 18:25:41 UTC 2016 - dmitr...@opensuse.org
+
+- Fix broken swig import script when using swig >= 3.0.10
+ * kicad-swig-3.0.10.patch
+
+-------------------------------------------------------------------
New:
----
kicad-swig-3.0.10.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kicad.spec ++++++
--- /var/tmp/diff_new_pack.4jtMYm/_old 2016-07-12 23:52:12.000000000 +0200
+++ /var/tmp/diff_new_pack.4jtMYm/_new 2016-07-12 23:52:12.000000000 +0200
@@ -34,6 +34,8 @@
# kicad looks in /usr/share/doc/kicad for help files and doesn't find them.
# this patch adds packges/ befor kicad.
Patch3: kicad-suse-help-path.patch
+# PATCH-FIX-UPSTREAM kicad-swig-3.0.10.patch -- Fix broken swig import script
when using swig >= 3.0.10
+Patch4: kicad-swig-3.0.10.patch
%if 0%{?suse_version} > 1320
BuildRequires: boost-devel >= 1.56
%else
@@ -95,6 +97,7 @@
%patch1 -p1
%patch2 -p1
%patch3
+%patch4 -p1
cp %{SOURCE2} .
++++++ kicad-swig-3.0.10.patch ++++++
Index: kicad-4.0.2/scripting/build_tools/fix_swig_imports.py
===================================================================
--- kicad-4.0.2.orig/scripting/build_tools/fix_swig_imports.py
+++ kicad-4.0.2/scripting/build_tools/fix_swig_imports.py
@@ -37,6 +37,12 @@ if (len(lines)<4000):
txt = ""
for l in lines:
+ 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,6,0):"): # ok with swig version
<= 3.0.2
l = l.replace("version_info >= (2,6,0)","False")
doneOk = True
