[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/

[David Seifert]

commit:     66c01bd53b7f13d75df1c8e44c4854390b04c4c5
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 31 17:48:15 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 22:41:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c01bd5

sci-electronics/kicad: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3740

 .../kicad/files/kicad-4.0.2-boost-context.patch    | 107 ---------------------
 .../files/kicad-4.0.2-swig-import-helper.patch     |  31 ------
 2 files changed, 138 deletions(-)

diff --git a/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch b/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
deleted file mode 100644
index 00e80f3..00000000
--- a/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-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
- #################################################
- if( KICAD_SKIP_BOOST )
--    find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale
-+    find_package( Boost 1.54.0 REQUIRED COMPONENTS date_time filesystem iostreams locale
-                                                    program_options regex system thread )
- 
-     if( NOT Boost_FOUND )
-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
-     view/view_group.cpp
- 
-+    system/libcontext.cpp
-+
-     math/math_util.cpp
- 
-     tool/tool_action.cpp
-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 @@
- 
- #include <cstdlib>
- 
--#include <boost/context/fcontext.hpp>
--#include <boost/version.hpp>
-+#include <system/libcontext.h>
- 
- #include "delegate.h"
- 
-@@ -92,10 +91,8 @@
-         if( m_saved )
-             delete m_saved;
- 
--#if BOOST_VERSION >= 105600
-         if( m_self )
-             delete m_self;
--#endif
- 
-         if( m_stack )
-             free( m_stack );
-@@ -156,13 +153,9 @@
-         assert( m_saved == NULL );
- 
-         m_args = &aArgs;
--#if BOOST_VERSION >= 105600
--        m_self = new boost::context::fcontext_t();
--        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
--#else
--        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
--#endif
--        m_saved = new boost::context::fcontext_t();
-+        m_self = new fcontext_t();
-+        *m_self = make_fcontext( sp, m_stackSize, callerStub );
-+        m_saved = new fcontext_t();
- 
-         m_running = true;
-         // off we go!
-@@ -222,14 +215,10 @@
-     }
- 
-     ///> Wrapper for jump_fcontext to assure compatibility between different boost versions
--    static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew,
-+    static inline intptr_t jump(fcontext_t* aOld, fcontext_t* aNew,
-                                 intptr_t aP, bool aPreserveFPU = true )
-     {
--#if BOOST_VERSION >= 105600
--        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
--        return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
--#endif
-+        return jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
-     }
- 
-     template <typename T>
-@@ -252,10 +241,10 @@
-     ReturnType m_retVal;
- 
-     ///< saved caller context
--    boost::context::fcontext_t* m_saved;
-+    fcontext_t* m_saved;
- 
-     ///< saved coroutine context
--    boost::context::fcontext_t* m_self;
-+    fcontext_t* m_self;
- 
-     ///< coroutine stack
-     void* m_stack;

diff --git a/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch b/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
deleted file mode 100644
index 9202acc..00000000
--- a/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 = ""
- 
- for l in lines:
--    if l.startswith("if version_info >= (2,6,0):"):     # ok with swig version <= 3.0.2
-+    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, 7, 0):"):     # ok with swig version >= 3.0.9
-+        l = l.replace("version_info >= (2, 7, 0)","False")
-+        doneOk = True
-+    elif l.startswith("elif version_info >= (2, 6, 0):"):  # needed with swig version >= 3.0.9
-+        l = l.replace("version_info >= (2, 6, 0)","False")
-+        doneOk = True
-+    elif 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
-     elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig version 3.0.3
-@@ -60,6 +72,3 @@
- 
- 
- exit(0)
--
--
--