Accepting request 423572 from home:Dmitry_R:branches:electronics

OBS-URL: https://build.opensuse.org/request/show/423572
OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=25
This commit is contained in:
Dmitry Roshchin 2016-08-28 17:44:24 +00:00 committed by Git OBS Bridge
parent b1760a5f1f
commit 4d8cc330fb
5 changed files with 14 additions and 27 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9
size 10841200

3
kicad-4.0.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f45ac77ed14953d8f8a4413db7ff6c283d8175e9a16460b1579a6a8ff917547
size 10609432

View File

@ -1,17 +0,0 @@
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

View File

@ -7,6 +7,13 @@ Sat Aug 27 17:17:53 UTC 2016 - stefan.bruens@rwth-aachen.de
- Set C++ version to C++11, required by boost patch
* Add kicad-set-cxx-version.patch
-------------------------------------------------------------------
Mon Aug 8 17:20:58 UTC 2016 - dmitry_r@opensuse.org
- Update to version 4.0.3
* Bugfix release
* Drop obsolete kicad-swig-3.0.10.patch
-------------------------------------------------------------------
Thu Jul 7 18:25:41 UTC 2016 - dmitry_r@opensuse.org

View File

@ -17,7 +17,7 @@
Name: kicad
Version: 4.0.2
Version: 4.0.3
Release: 0
Summary: EDA software suite for the creation of schematics and PCB
License: GPL-2.0+ and GPL-3.0+
@ -34,13 +34,11 @@ Patch2: kicad-library-repos-install.patch
# 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 || 0%{?suse_version} == 1315
# PATCH-FIX-UPSTREAM kicad-boost-1_61-boost-context-changes.patch -- Fix build with boost 1.61
Patch5: kicad-boost-1_61-boost-context-changes.patch
Patch4: kicad-boost-1_61-boost-context-changes.patch
# PATCH-OPENSUSE kicad-set-cxx-standard.diff -- use C++14 by default and decay to 11, required by boost 1.61 patch
Patch6: kicad-set-cxx-version.patch
Patch5: kicad-set-cxx-version.patch
%endif
%if 0%{?suse_version} > 1320
BuildRequires: boost-devel >= 1.56
@ -103,11 +101,10 @@ This package contains script for KiCad libraries downloading.
%patch1 -p1
%patch2 -p1
%patch3
%patch4 -p1
# patch requires C++11, CMAKE_CXX_STANDARD requires cmake 3.1 -> Leap 42.1 or TW
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315
%patch4 -p1
%patch5 -p1
%patch6 -p1
%endif
cp %{SOURCE2} .