Accepting request 427051 from home:plater

Update to 4.0.4

OBS-URL: https://build.opensuse.org/request/show/427051
OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=27

kicad-4.0.3.tar.xz

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

kicad-4.0.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00
+size 10672424

kicad-set-cxx-version.patch

@@ -1,11 +1,13 @@
---- kicad-4.0.2/CMakeLists.txt_orig	2016-08-27 21:24:50.616212416 +0200
+Index: CMakeLists.txt
-+++ kicad-4.0.2/CMakeLists.txt	2016-08-27 21:24:30.103970797 +0200
+===================================================================
-@@ -143,6 +143,8 @@
+--- CMakeLists.txt.orig
-     set( CMAKE_C_FLAGS   "-Wall ${CMAKE_C_FLAGS}" )
++++ CMakeLists.txt
-     set( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" )
+@@ -142,6 +142,8 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CX
- 
+     # subsequently on the command line, such as in pcbnew/github/CMakeLists.txt
-+    set( CMAKE_CXX_STANDARD 14 )
+     set( CMAKE_C_FLAGS   "-Wall ${CMAKE_C_FLAGS}" )
-+
+     set( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" )
-     # The optimization level is -O1 instead of the usual -O2 level because
++    
-     # boost::polygon has a function (inflate polygon) broken by the -O2 level
++    set( CMAKE_CXX_STANDARD 14 )
-     # with GCC 4.7.0 to 4.7.2 (works fine with  with GCC 4.6 and 4.7.3).
+ 
+     # The optimization level is -O1 instead of the usual -O2 level because
+     # boost::polygon has a function (inflate polygon) broken by the -O2 level

kicad-suse-help-path.patch

@@ -3,10 +3,10 @@ Index: common/searchhelpfilefullpath.cpp
 --- common/searchhelpfilefullpath.cpp.orig
 +++ common/searchhelpfilefullpath.cpp
 @@ -107,6 +107,7 @@ wxString SearchHelpFileFullPath( const S
-     // Below we account for an international subdirectory.
+     // Below we account for an international subdirectory.
-     subdirs.Add( wxT( "share" ) );
+     subdirs.Add( wxT( "share" ) );
-     subdirs.Add( wxT( "doc" ) );
+     subdirs.Add( wxT( "doc" ) );
-+    subdirs.Add( wxT( "packages" ) );
++    subdirs.Add( wxT( "packages" ) );
-     subdirs.Add( wxT( "kicad" ) );
+     subdirs.Add( wxT( "kicad" ) );
-     subdirs.Add( wxT( "help" ) );
+     subdirs.Add( wxT( "help" ) );
- 
+ 

kicad-user-library.patch

@@ -1,18 +1,26 @@
-Index: kicad-4.0.0-rc1/common/kiface_i.cpp
+Index: common/kiface_i.cpp
 ===================================================================
---- kicad-4.0.0-rc1.orig/common/kiface_i.cpp
+--- common/kiface_i.cpp.orig
-+++ kicad-4.0.0-rc1/common/kiface_i.cpp
++++ common/kiface_i.cpp
-@@ -80,6 +80,13 @@ static void setSearchPaths( SEARCH_STACK
+@@ -53,6 +53,7 @@ static void setSearchPaths( SEARCH_STACK
-         aDst->AddPaths( fn.GetPath() );
+ 
-     }
+             fn.AppendDir( wxT( "library" ) );
- 
+             aDst->AddPaths( fn.GetPath() );
-+// user local library
++            
-+wxString homeDir = wxFileName::GetHomeDir();
+ 
-+aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/library" ) );
+             fn.AppendDir( wxT( "doc" ) );
-+aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules" ) );
+             aDst->AddPaths( fn.GetPath() );
-+aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules/packages3d" ) );
+@@ -60,6 +61,13 @@ static void setSearchPaths( SEARCH_STACK
-+aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/template" ) );
+             fn.RemoveLastDir();
-+
+             fn.RemoveLastDir();     // "../../"  up twice, removing library/doc/
- #ifndef __WXMAC__
+         }
-     aDst->AddPaths( wxT( "/usr/local/share" ) );
++       // user local library
- #endif
++      wxString homeDir = wxFileName::GetHomeDir();
++      aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/library" ) );
++      aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules" ) );
++      aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules/packages3d" ) );
++      aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/template" ) );
++ 
+ 
+         // Add PCB library file path to search path list.
+         if( aId == KIWAY::FACE_PCB || aId == KIWAY::FACE_CVPCB )

kicad.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep 12 14:02:01 UTC 2016 - davejplater@gmail.com
+
+- Update to version 4.0.4
+  *bugfix release
+- Ran dos2unix and rebased
+  kicad-boost-1_61-boost-context-changes.patch
+- Rebased kicad-set-cxx-version.patch,kicad-suse-help-path.patch,
+  and kicad-user-library.patch.
+
 -------------------------------------------------------------------
 Sat Aug 27 17:17:53 UTC 2016 - stefan.bruens@rwth-aachen.de
 

kicad.spec

@@ -17,7 +17,7 @@
 
 
 Name:           kicad
-Version:        4.0.3
+Version:        4.0.4
 Release:        0
 Summary:        EDA software suite for the creation of schematics and PCB
 License:        GPL-2.0+ and GPL-3.0+
@@ -98,13 +98,13 @@ This package contains script for KiCad libraries downloading.
 
 %prep
 %setup -q -n kicad-%{version}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p1
 %patch3
 # 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
+%patch4
-%patch5 -p1
+%patch5 -p0
 %endif
 
 cp %{SOURCE2} .