+++ /dev/null
-diff -Naur kicad-4.0.2-orig/common/system/libcontext.cpp kicad-4.0.2/common/system/libcontext.cpp
---- kicad-4.0.2-orig/common/system/libcontext.cpp 2016-06-16 22:30:58.000000000 -0700
-+++ kicad-4.0.2/common/system/libcontext.cpp 2016-06-16 22:35:46.654719468 -0700
-@@ -13,7 +13,7 @@
- http://www.boost.org/LICENSE_1_0.txt)
-
- */
--#include "libcontext.h"
-+#include <system/libcontext.h>
- #if defined(LIBCONTEXT_PLATFORM_windows_i386) && defined(LIBCONTEXT_COMPILER_gcc)
- __asm (
- ".text\n"
-diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt
---- kicad-4.0.2-orig/CMakeLists.txt 2016-02-13 13:14:42.000000000 -0800
-+++ kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700
-@@ -561,7 +561,7 @@
- # Download boost and possibly build parts of it\r
- #################################################\r
- if( KICAD_SKIP_BOOST )\r
-- find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale\r
-+ find_package( Boost 1.54.0 REQUIRED COMPONENTS date_time filesystem iostreams locale\r
- program_options regex system thread )\r
- \r
- if( NOT Boost_FOUND )\r
-diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt kicad-4.0.2/common/CMakeLists.txt
---- kicad-4.0.2-orig/common/CMakeLists.txt 2016-02-13 13:14:42.000000000 -0800
-+++ kicad-4.0.2/common/CMakeLists.txt 2016-06-11 01:10:04.886830434 -0700
-@@ -256,6 +256,8 @@
- view/view_item.cpp\r
- view/view_group.cpp\r
- \r
-+ system/libcontext.cpp\r
-+\r
- math/math_util.cpp\r
- \r
- tool/tool_action.cpp\r
-diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/coroutine.h
---- kicad-4.0.2-orig/include/tool/coroutine.h 2016-02-13 13:14:42.000000000 -0800
-+++ kicad-4.0.2/include/tool/coroutine.h 2016-06-11 01:07:06.035378422 -0700
-@@ -27,8 +27,7 @@
- \r
- #include <cstdlib>\r
- \r
--#include <boost/context/fcontext.hpp>\r
--#include <boost/version.hpp>\r
-+#include <system/libcontext.h>\r
- \r
- #include "delegate.h"\r
- \r
-@@ -92,10 +91,8 @@
- if( m_saved )\r
- delete m_saved;\r
- \r
--#if BOOST_VERSION >= 105600\r
- if( m_self )\r
- delete m_self;\r
--#endif\r
- \r
- if( m_stack )\r
- free( m_stack );\r
-@@ -156,13 +153,9 @@
- assert( m_saved == NULL );\r
- \r
- m_args = &aArgs;\r
--#if BOOST_VERSION >= 105600\r
-- m_self = new boost::context::fcontext_t();\r
-- *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );\r
--#else\r
-- m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );\r
--#endif\r
-- m_saved = new boost::context::fcontext_t();\r
-+ m_self = new fcontext_t();\r
-+ *m_self = make_fcontext( sp, m_stackSize, callerStub );\r
-+ m_saved = new fcontext_t();\r
- \r
- m_running = true;\r
- // off we go!\r
-@@ -222,14 +215,10 @@
- }\r
- \r
- ///> Wrapper for jump_fcontext to assure compatibility between different boost versions\r
-- static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew,\r
-+ static inline intptr_t jump(fcontext_t* aOld, fcontext_t* aNew,\r
- intptr_t aP, bool aPreserveFPU = true )\r
- {\r
--#if BOOST_VERSION >= 105600\r
-- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );\r
--#else\r
-- return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );\r
--#endif\r
-+ return jump_fcontext( aOld, *aNew, aP, aPreserveFPU );\r
- }\r
- \r
- template <typename T>\r
-@@ -252,10 +241,10 @@
- ReturnType m_retVal;\r
- \r
- ///< saved caller context\r
-- boost::context::fcontext_t* m_saved;\r
-+ fcontext_t* m_saved;\r
- \r
- ///< saved coroutine context\r
-- boost::context::fcontext_t* m_self;\r
-+ fcontext_t* m_self;\r
- \r
- ///< coroutine stack\r
- void* m_stack;\r
+++ /dev/null
-diff -Naur kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py kicad-4.0.2/scripting/build_tools/fix_swig_imports.py
---- kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py 2016-02-13 13:14:42.000000000 -0800
-+++ kicad-4.0.2/scripting/build_tools/fix_swig_imports.py 2016-06-26 00:49:20.336661983 -0700
-@@ -37,7 +37,19 @@
- txt = ""\r
- \r
- for l in lines:\r
-- if l.startswith("if version_info >= (2,6,0):"): # ok with swig version <= 3.0.2\r
-+ if l.startswith("if _swig_python_version_info >= (2, 7, 0):"): # ok with swig version >= 3.0.10\r
-+ l = l.replace("_swig_python_version_info >= (2, 7, 0)","False")\r
-+ doneOk = True\r
-+ elif l.startswith("elif _swig_python_version_info >= (2, 6, 0):"): # needed with swig version >= 3.0.10\r
-+ l = l.replace("_swig_python_version_info >= (2, 6, 0)","False")\r
-+ doneOk = True\r
-+ if l.startswith("if version_info >= (2, 7, 0):"): # ok with swig version >= 3.0.9\r
-+ l = l.replace("version_info >= (2, 7, 0)","False")\r
-+ doneOk = True\r
-+ elif l.startswith("elif version_info >= (2, 6, 0):"): # needed with swig version >= 3.0.9\r
-+ l = l.replace("version_info >= (2, 6, 0)","False")\r
-+ doneOk = True\r
-+ elif l.startswith("if version_info >= (2,6,0):"): # ok with swig version <= 3.0.2\r
- l = l.replace("version_info >= (2,6,0)","False")\r
- doneOk = True\r
- elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig version 3.0.3\r
-@@ -60,6 +72,3 @@
- \r
- \r
- exit(0)\r
--\r
--\r
--\r