[arch-commits] Commit in kicad/repos (8 files)

Kyle Keen kkeen at archlinux.org
Sat Mar 11 11:53:40 UTC 2017


    Date: Saturday, March 11, 2017 @ 11:53:39
  Author: kkeen
Revision: 215652

archrelease: copy trunk to community-i686, community-x86_64

Added:
  kicad/repos/community-i686/PKGBUILD
    (from rev 215651, kicad/trunk/PKGBUILD)
  kicad/repos/community-i686/boost-1.61.patch
    (from rev 215651, kicad/trunk/boost-1.61.patch)
  kicad/repos/community-x86_64/PKGBUILD
    (from rev 215651, kicad/trunk/PKGBUILD)
  kicad/repos/community-x86_64/boost-1.61.patch
    (from rev 215651, kicad/trunk/boost-1.61.patch)
Deleted:
  kicad/repos/community-i686/PKGBUILD
  kicad/repos/community-i686/boost-1.61.patch
  kicad/repos/community-x86_64/PKGBUILD
  kicad/repos/community-x86_64/boost-1.61.patch

-----------------------------------+
 /PKGBUILD                         |  128 ++++++
 /boost-1.61.patch                 |  694 ++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD           |   64 ---
 community-i686/boost-1.61.patch   |  347 ------------------
 community-x86_64/PKGBUILD         |   64 ---
 community-x86_64/boost-1.61.patch |  347 ------------------
 6 files changed, 822 insertions(+), 822 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-03-11 11:53:15 UTC (rev 215651)
+++ community-i686/PKGBUILD	2017-03-11 11:53:39 UTC (rev 215652)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Marq Schneider <queueRAM at gmail.com>
-
-pkgname=kicad
-pkgver=4.0.5
-pkgrel=2
-pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
-#url="http://iut-tice.ujf-grenoble.fr/kicad/"
-url="http://kicad-pcb.org/"
-license=('GPL')
-depends=('wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm' 'boost-libs' 'glew' 'wxpython')
-makedepends=('cmake' 'zlib' 'mesa' 'boost' 'gettext' 'wxpython' 'swig')
-optdepends=('kicad-library: for footprints and symbols'
-            'kicad-library-3d: for 3d models of components')
-source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz"
-        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz"
-        "boost-1.61.patch")
-md5sums=('d599fe87fd0f9ce32db1be76da7a5945'
-         '16e42f905b46af04c5c29ef22337cd4d'
-         '56276be014b3719442be10284729a4c3')
-
-prepare() {
-  cd "$srcdir/kicad-$pkgver"
-  # Remove on 4.0.5?  Or whenever they finally merge it.
-  patch -Np1 --binary -i ../boost-1.61.patch
-}
-
-build() {
-  cd "$srcdir/kicad-$pkgver"
-
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DKICAD_STABLE_VERSION=ON     \
-              -DKICAD_REPO_NAME=stable      \
-              -DKICAD_BUILD_VERSION=$pkgver \
-              -DCMAKE_BUILD_TYPE=Release    \
-              -DCMAKE_INSTALL_PREFIX=/usr   \
-              -DKICAD_SKIP_BOOST=ON         \
-              -DKICAD_SCRIPTING=ON          \
-              -DKICAD_SCRIPTING_MODULES=ON  \
-              -DKICAD_SCRIPTING_WXPYTHON=ON \
-              -DBUILD_GITHUB_PLUGIN=ON
-  make
-
-  cd "$srcdir/kicad-i18n-$pkgver"
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/kicad-$pkgver/build/Release"
-
-  make DESTDIR="$pkgdir" install
-
-  # copy updated linux icons
-  #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
-
-  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
-  make DESTDIR="$pkgdir" install
-}

Copied: kicad/repos/community-i686/PKGBUILD (from rev 215651, kicad/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-03-11 11:53:39 UTC (rev 215652)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Marq Schneider <queueRAM at gmail.com>
+
+pkgname=kicad
+pkgver=4.0.6
+pkgrel=1
+pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
+arch=('i686' 'x86_64')
+#url="http://iut-tice.ujf-grenoble.fr/kicad/"
+url="http://kicad-pcb.org/"
+license=('GPL')
+depends=('wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm' 'boost-libs' 'glew' 'wxpython' 'curl')
+makedepends=('cmake' 'zlib' 'mesa' 'boost' 'gettext' 'wxpython' 'swig')
+optdepends=('kicad-library: for footprints and symbols'
+            'kicad-library-3d: for 3d models of components')
+source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz"
+        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz"
+        "boost-1.61.patch")
+md5sums=('24eca1f22bbb0a88acbba321a4b1c4aa'
+         '6680338a8b23e7d651bb30cbba04e2b3'
+         '56276be014b3719442be10284729a4c3')
+
+prepare() {
+  cd "$srcdir/kicad-$pkgver"
+  # Remove on 4.0.5?  Or whenever they finally merge it.
+  patch -Np1 --binary -i ../boost-1.61.patch
+}
+
+build() {
+  cd "$srcdir/kicad-$pkgver"
+
+  mkdir -p build/Release
+  cd build/Release
+  cmake ../.. -DKICAD_STABLE_VERSION=ON     \
+              -DKICAD_REPO_NAME=stable      \
+              -DKICAD_BUILD_VERSION=$pkgver \
+              -DCMAKE_BUILD_TYPE=Release    \
+              -DCMAKE_INSTALL_PREFIX=/usr   \
+              -DKICAD_SKIP_BOOST=ON         \
+              -DKICAD_SCRIPTING=ON          \
+              -DKICAD_SCRIPTING_MODULES=ON  \
+              -DKICAD_SCRIPTING_WXPYTHON=ON \
+              -DBUILD_GITHUB_PLUGIN=ON
+  make
+
+  cd "$srcdir/kicad-i18n-$pkgver"
+  mkdir -p build/Release
+  cd build/Release
+  cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/kicad-$pkgver/build/Release"
+
+  make DESTDIR="$pkgdir" install
+
+  # copy updated linux icons
+  #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
+
+  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/boost-1.61.patch
===================================================================
--- community-i686/boost-1.61.patch	2017-03-11 11:53:15 UTC (rev 215651)
+++ community-i686/boost-1.61.patch	2017-03-11 11:53:39 UTC (rev 215652)
@@ -1,347 +0,0 @@
---- a/common/tool/tool_manager.cpp
-+++ b/common/tool/tool_manager.cpp
-@@ -532,11 +532,11 @@
-                     if( st->cofunc )
-                         st->Push();
- 
-+                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
-+
-                     // as the state changes, the transition table has to be set up again
-                     st->transitions.clear();
- 
--                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
--
-                     // got match? Run the handler.
-                     st->cofunc->Call( aEvent );
- 
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -27,10 +28,15 @@
- 
- #include <cstdlib>
- 
--#include <boost/context/fcontext.hpp>
- #include <boost/version.hpp>
-+#include <type_traits>
- 
--#include "delegate.h"
-+#if BOOST_VERSION <= 106000
-+#include <boost/context/fcontext.hpp>
-+#else
-+#include <boost/context/execution_context.hpp>
-+#include <boost/context/protected_fixedsize_stack.hpp>
-+#endif
- 
- /**
-  *  Class COROUNTINE.
-@@ -53,13 +59,12 @@
-  *  See coroutine_example.cpp for sample code.
-  */
- 
--template <class ReturnType, class ArgType>
-+template <typename ReturnType, typename ArgType>
- class COROUTINE
- {
- public:
-     COROUTINE() :
--        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
--        m_running( false )
-+        COROUTINE( nullptr )
-     {
-     }
- 
-@@ -69,8 +74,7 @@
-      */
-     template <class T>
-     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
--        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
-     {
-     }
- 
-@@ -78,9 +82,15 @@
-      * Constructor
-      * Creates a coroutine from a delegate object
-      */
--    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
--        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
-+        m_func( std::move( aEntry ) ),
-+        m_running( false ),
-+#if BOOST_VERSION <= 106000
-+        m_stack( nullptr ),
-+        m_stackSize( c_defaultStackSize ),
-+#endif
-+        m_caller( nullptr ),
-+        m_callee( nullptr )
-     {
-         // Avoid not initialized members, and make static analysers quiet
-         m_args = 0;
-@@ -89,18 +99,26 @@
- 
-     ~COROUTINE()
-     {
--        if( m_saved )
--            delete m_saved;
--
- #if BOOST_VERSION >= 105600
--        if( m_self )
--            delete m_self;
-+        delete m_callee;
- #endif
- 
-+#if BOOST_VERSION <= 106000
-+        delete m_caller;
-+
-         if( m_stack )
-             free( m_stack );
-+#endif
-     }
- 
-+private:
-+#if BOOST_VERSION <= 106000
-+    using context_type = boost::context::fcontext_t;
-+#else
-+    using context_type = boost::context::execution_context<COROUTINE*>;
-+#endif
-+
-+public:
-     /**
-      * Function Yield()
-      *
-@@ -110,7 +128,12 @@
-      */
-     void Yield()
-     {
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        auto result = (*m_caller)( this );
-+        *m_caller = std::move( std::get<0>( result ) );
-+#endif
-     }
- 
-     /**
-@@ -122,7 +145,11 @@
-     void Yield( ReturnType& aRetVal )
-     {
-         m_retVal = aRetVal;
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        m_caller( this );
-+#endif
-     }
- 
-     /**
-@@ -130,9 +157,9 @@
-      *
-      * Defines the entry point for the coroutine, if not set in the constructor.
-      */
--    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
-+    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
-     {
--        m_func = aEntry;
-+        m_func = std::move( aEntry );
-     }
- 
-     /* Function Call()
-@@ -143,6 +170,10 @@
-      */
-     bool Call( ArgType aArgs )
-     {
-+        assert( m_callee == NULL );
-+        assert( m_caller == NULL );
-+
-+#if BOOST_VERSION <= 106000
-         // fixme: Clean up stack stuff. Add a guard
-         m_stack = malloc( c_defaultStackSize );
- 
-@@ -151,22 +182,32 @@
- 
-         // correct the stack size
-         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
--
--        assert( m_self == NULL );
--        assert( m_saved == NULL );
-+#endif
- 
-         m_args = &aArgs;
--#if BOOST_VERSION >= 105600
--        m_self = new boost::context::fcontext_t();
--        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+
-+#if BOOST_VERSION < 105600
-+        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+#elif BOOST_VERSION <= 106000
-+        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
- #else
--        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+        m_callee = new context_type( std::allocator_arg_t(),
-+                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
-+#endif
-+
-+#if BOOST_VERSION <= 106000
-+        m_caller = new context_type();
- #endif
--        m_saved = new boost::context::fcontext_t();
- 
-         m_running = true;
-+
-         // off we go!
--        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
-         return m_running;
-     }
- 
-@@ -179,7 +220,12 @@
-      */
-     bool Resume()
-     {
--        jump( m_saved, m_self, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, false );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
- 
-         return m_running;
-     }
-@@ -208,61 +254,66 @@
-     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
- 
-     /* real entry point of the coroutine */
-+#if BOOST_VERSION <= 106000
-     static void callerStub( intptr_t aData )
-+#else
-+    static context_type callerStub( context_type caller, COROUTINE* cor )
-+#endif
-     {
-         // get pointer to self
-+#if BOOST_VERSION <= 106000
-         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
-+#else
-+        cor->m_caller = &caller;
-+#endif
- 
-         // call the coroutine method
--        cor->m_retVal = cor->m_func( *cor->m_args );
-+        cor->m_retVal = cor->m_func( *( cor->m_args ) );
-         cor->m_running = false;
- 
-         // go back to wherever we came from.
--        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
-+#if BOOST_VERSION <= 106000
-+        jump( cor->m_callee, cor->m_caller, 0 );
-+#else
-+        return caller;
-+#endif
-     }
- 
-     ///> 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,
-+#if BOOST_VERSION <= 106000
-+    static inline intptr_t jump( context_type* aOld, context_type* aNew,
-                                 intptr_t aP, bool aPreserveFPU = true )
-     {
--#if BOOST_VERSION >= 105600
--        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
-+#if BOOST_VERSION < 105600
-         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
-+#else
-+        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
- #endif
-     }
-+#endif
- 
--    template <typename T>
--    struct strip_ref
--    {
--        typedef T result;
--    };
-+    std::function<ReturnType(ArgType)> m_func;
- 
--    template <typename T>
--    struct strip_ref<T&>
--    {
--        typedef T result;
--    };
-+    bool m_running;
- 
--    DELEGATE<ReturnType, ArgType> m_func;
-+#if BOOST_VERSION <= 106000
-+    ///< coroutine stack
-+    void* m_stack;
-+
-+    size_t m_stackSize;
-+#endif
- 
-     ///< pointer to coroutine entry arguments. Stripped of references
-     ///< to avoid compiler errors.
--    typename strip_ref<ArgType>::result* m_args;
-+    typename std::remove_reference<ArgType>::type* m_args;
-+
-     ReturnType m_retVal;
- 
-     ///< saved caller context
--    boost::context::fcontext_t* m_saved;
-+    context_type* m_caller;
- 
-     ///< saved coroutine context
--    boost::context::fcontext_t* m_self;
--
--    ///< coroutine stack
--    void* m_stack;
--
--    size_t m_stackSize;
--
--    bool m_running;
-+    context_type* m_callee;
- };
- 
- #endif
---- a/include/tool/tool_base.h
-+++ b/include/tool/tool_base.h
-@@ -31,7 +32,7 @@
- #include <tool/tool_event.h>
- #include <tool/tool_settings.h>
- 
--#include <tool/delegate.h>
-+#include <functional>
- 
- class EDA_ITEM;
- class TOOL_MANAGER;
-@@ -53,7 +54,9 @@
- 
- /// Unique identifier for tools
- typedef int TOOL_ID;
--typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
-+
-+using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
-+
- 
- /**
-  * Class TOOL_BASE
---- a/include/tool/tool_interactive.h
-+++ b/include/tool/tool_interactive.h
-@@ -113,7 +114,7 @@
- void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
-                            const TOOL_EVENT_LIST& aConditions )
- {
--    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
-+    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
- 
-     goInternal( sptr, aConditions );
- }
-

Copied: kicad/repos/community-i686/boost-1.61.patch (from rev 215651, kicad/trunk/boost-1.61.patch)
===================================================================
--- community-i686/boost-1.61.patch	                        (rev 0)
+++ community-i686/boost-1.61.patch	2017-03-11 11:53:39 UTC (rev 215652)
@@ -0,0 +1,347 @@
+--- a/common/tool/tool_manager.cpp
++++ b/common/tool/tool_manager.cpp
+@@ -532,11 +532,11 @@
+                     if( st->cofunc )
+                         st->Push();
+ 
++                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
++
+                     // as the state changes, the transition table has to be set up again
+                     st->transitions.clear();
+ 
+-                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
+-
+                     // got match? Run the handler.
+                     st->cofunc->Call( aEvent );
+ 
+--- a/include/tool/coroutine.h
++++ b/include/tool/coroutine.h
+@@ -27,10 +28,15 @@
+ 
+ #include <cstdlib>
+ 
+-#include <boost/context/fcontext.hpp>
+ #include <boost/version.hpp>
++#include <type_traits>
+ 
+-#include "delegate.h"
++#if BOOST_VERSION <= 106000
++#include <boost/context/fcontext.hpp>
++#else
++#include <boost/context/execution_context.hpp>
++#include <boost/context/protected_fixedsize_stack.hpp>
++#endif
+ 
+ /**
+  *  Class COROUNTINE.
+@@ -53,13 +59,12 @@
+  *  See coroutine_example.cpp for sample code.
+  */
+ 
+-template <class ReturnType, class ArgType>
++template <typename ReturnType, typename ArgType>
+ class COROUTINE
+ {
+ public:
+     COROUTINE() :
+-        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
+-        m_running( false )
++        COROUTINE( nullptr )
+     {
+     }
+ 
+@@ -69,8 +74,7 @@
+      */
+     template <class T>
+     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
+-        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
+     {
+     }
+ 
+@@ -78,9 +82,15 @@
+      * Constructor
+      * Creates a coroutine from a delegate object
+      */
+-    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
+-        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
++        m_func( std::move( aEntry ) ),
++        m_running( false ),
++#if BOOST_VERSION <= 106000
++        m_stack( nullptr ),
++        m_stackSize( c_defaultStackSize ),
++#endif
++        m_caller( nullptr ),
++        m_callee( nullptr )
+     {
+         // Avoid not initialized members, and make static analysers quiet
+         m_args = 0;
+@@ -89,18 +99,26 @@
+ 
+     ~COROUTINE()
+     {
+-        if( m_saved )
+-            delete m_saved;
+-
+ #if BOOST_VERSION >= 105600
+-        if( m_self )
+-            delete m_self;
++        delete m_callee;
+ #endif
+ 
++#if BOOST_VERSION <= 106000
++        delete m_caller;
++
+         if( m_stack )
+             free( m_stack );
++#endif
+     }
+ 
++private:
++#if BOOST_VERSION <= 106000
++    using context_type = boost::context::fcontext_t;
++#else
++    using context_type = boost::context::execution_context<COROUTINE*>;
++#endif
++
++public:
+     /**
+      * Function Yield()
+      *
+@@ -110,7 +128,12 @@
+      */
+     void Yield()
+     {
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        auto result = (*m_caller)( this );
++        *m_caller = std::move( std::get<0>( result ) );
++#endif
+     }
+ 
+     /**
+@@ -122,7 +145,11 @@
+     void Yield( ReturnType& aRetVal )
+     {
+         m_retVal = aRetVal;
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        m_caller( this );
++#endif
+     }
+ 
+     /**
+@@ -130,9 +157,9 @@
+      *
+      * Defines the entry point for the coroutine, if not set in the constructor.
+      */
+-    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
++    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
+     {
+-        m_func = aEntry;
++        m_func = std::move( aEntry );
+     }
+ 
+     /* Function Call()
+@@ -143,6 +170,10 @@
+      */
+     bool Call( ArgType aArgs )
+     {
++        assert( m_callee == NULL );
++        assert( m_caller == NULL );
++
++#if BOOST_VERSION <= 106000
+         // fixme: Clean up stack stuff. Add a guard
+         m_stack = malloc( c_defaultStackSize );
+ 
+@@ -151,22 +182,32 @@
+ 
+         // correct the stack size
+         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
+-
+-        assert( m_self == NULL );
+-        assert( m_saved == NULL );
++#endif
+ 
+         m_args = &aArgs;
+-#if BOOST_VERSION >= 105600
+-        m_self = new boost::context::fcontext_t();
+-        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++
++#if BOOST_VERSION < 105600
++        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++#elif BOOST_VERSION <= 106000
++        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
+ #else
+-        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++        m_callee = new context_type( std::allocator_arg_t(),
++                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
++#endif
++
++#if BOOST_VERSION <= 106000
++        m_caller = new context_type();
+ #endif
+-        m_saved = new boost::context::fcontext_t();
+ 
+         m_running = true;
++
+         // off we go!
+-        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+         return m_running;
+     }
+ 
+@@ -179,7 +220,12 @@
+      */
+     bool Resume()
+     {
+-        jump( m_saved, m_self, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, false );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+ 
+         return m_running;
+     }
+@@ -208,61 +254,66 @@
+     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
+ 
+     /* real entry point of the coroutine */
++#if BOOST_VERSION <= 106000
+     static void callerStub( intptr_t aData )
++#else
++    static context_type callerStub( context_type caller, COROUTINE* cor )
++#endif
+     {
+         // get pointer to self
++#if BOOST_VERSION <= 106000
+         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
++#else
++        cor->m_caller = &caller;
++#endif
+ 
+         // call the coroutine method
+-        cor->m_retVal = cor->m_func( *cor->m_args );
++        cor->m_retVal = cor->m_func( *( cor->m_args ) );
+         cor->m_running = false;
+ 
+         // go back to wherever we came from.
+-        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
++#if BOOST_VERSION <= 106000
++        jump( cor->m_callee, cor->m_caller, 0 );
++#else
++        return caller;
++#endif
+     }
+ 
+     ///> 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,
++#if BOOST_VERSION <= 106000
++    static inline intptr_t jump( context_type* aOld, context_type* aNew,
+                                 intptr_t aP, bool aPreserveFPU = true )
+     {
+-#if BOOST_VERSION >= 105600
+-        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+-#else
++#if BOOST_VERSION < 105600
+         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
++#else
++        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+ #endif
+     }
++#endif
+ 
+-    template <typename T>
+-    struct strip_ref
+-    {
+-        typedef T result;
+-    };
++    std::function<ReturnType(ArgType)> m_func;
+ 
+-    template <typename T>
+-    struct strip_ref<T&>
+-    {
+-        typedef T result;
+-    };
++    bool m_running;
+ 
+-    DELEGATE<ReturnType, ArgType> m_func;
++#if BOOST_VERSION <= 106000
++    ///< coroutine stack
++    void* m_stack;
++
++    size_t m_stackSize;
++#endif
+ 
+     ///< pointer to coroutine entry arguments. Stripped of references
+     ///< to avoid compiler errors.
+-    typename strip_ref<ArgType>::result* m_args;
++    typename std::remove_reference<ArgType>::type* m_args;
++
+     ReturnType m_retVal;
+ 
+     ///< saved caller context
+-    boost::context::fcontext_t* m_saved;
++    context_type* m_caller;
+ 
+     ///< saved coroutine context
+-    boost::context::fcontext_t* m_self;
+-
+-    ///< coroutine stack
+-    void* m_stack;
+-
+-    size_t m_stackSize;
+-
+-    bool m_running;
++    context_type* m_callee;
+ };
+ 
+ #endif
+--- a/include/tool/tool_base.h
++++ b/include/tool/tool_base.h
+@@ -31,7 +32,7 @@
+ #include <tool/tool_event.h>
+ #include <tool/tool_settings.h>
+ 
+-#include <tool/delegate.h>
++#include <functional>
+ 
+ class EDA_ITEM;
+ class TOOL_MANAGER;
+@@ -53,7 +54,9 @@
+ 
+ /// Unique identifier for tools
+ typedef int TOOL_ID;
+-typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
++
++using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
++
+ 
+ /**
+  * Class TOOL_BASE
+--- a/include/tool/tool_interactive.h
++++ b/include/tool/tool_interactive.h
+@@ -113,7 +114,7 @@
+ void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
+                            const TOOL_EVENT_LIST& aConditions )
+ {
+-    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
++    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
+ 
+     goInternal( sptr, aConditions );
+ }
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-03-11 11:53:15 UTC (rev 215651)
+++ community-x86_64/PKGBUILD	2017-03-11 11:53:39 UTC (rev 215652)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Marq Schneider <queueRAM at gmail.com>
-
-pkgname=kicad
-pkgver=4.0.5
-pkgrel=2
-pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
-#url="http://iut-tice.ujf-grenoble.fr/kicad/"
-url="http://kicad-pcb.org/"
-license=('GPL')
-depends=('wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm' 'boost-libs' 'glew' 'wxpython')
-makedepends=('cmake' 'zlib' 'mesa' 'boost' 'gettext' 'wxpython' 'swig')
-optdepends=('kicad-library: for footprints and symbols'
-            'kicad-library-3d: for 3d models of components')
-source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz"
-        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz"
-        "boost-1.61.patch")
-md5sums=('d599fe87fd0f9ce32db1be76da7a5945'
-         '16e42f905b46af04c5c29ef22337cd4d'
-         '56276be014b3719442be10284729a4c3')
-
-prepare() {
-  cd "$srcdir/kicad-$pkgver"
-  # Remove on 4.0.5?  Or whenever they finally merge it.
-  patch -Np1 --binary -i ../boost-1.61.patch
-}
-
-build() {
-  cd "$srcdir/kicad-$pkgver"
-
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DKICAD_STABLE_VERSION=ON     \
-              -DKICAD_REPO_NAME=stable      \
-              -DKICAD_BUILD_VERSION=$pkgver \
-              -DCMAKE_BUILD_TYPE=Release    \
-              -DCMAKE_INSTALL_PREFIX=/usr   \
-              -DKICAD_SKIP_BOOST=ON         \
-              -DKICAD_SCRIPTING=ON          \
-              -DKICAD_SCRIPTING_MODULES=ON  \
-              -DKICAD_SCRIPTING_WXPYTHON=ON \
-              -DBUILD_GITHUB_PLUGIN=ON
-  make
-
-  cd "$srcdir/kicad-i18n-$pkgver"
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/kicad-$pkgver/build/Release"
-
-  make DESTDIR="$pkgdir" install
-
-  # copy updated linux icons
-  #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
-
-  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
-  make DESTDIR="$pkgdir" install
-}

Copied: kicad/repos/community-x86_64/PKGBUILD (from rev 215651, kicad/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-03-11 11:53:39 UTC (rev 215652)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Marq Schneider <queueRAM at gmail.com>
+
+pkgname=kicad
+pkgver=4.0.6
+pkgrel=1
+pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
+arch=('i686' 'x86_64')
+#url="http://iut-tice.ujf-grenoble.fr/kicad/"
+url="http://kicad-pcb.org/"
+license=('GPL')
+depends=('wxgtk' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm' 'boost-libs' 'glew' 'wxpython' 'curl')
+makedepends=('cmake' 'zlib' 'mesa' 'boost' 'gettext' 'wxpython' 'swig')
+optdepends=('kicad-library: for footprints and symbols'
+            'kicad-library-3d: for 3d models of components')
+source=("https://launchpad.net/kicad/4.0/$pkgver/+download/kicad-$pkgver.tar.xz"
+        "kicad-i18n.$pkgver.tar.gz::https://github.com/KiCad/kicad-i18n/archive/$pkgver.tar.gz"
+        "boost-1.61.patch")
+md5sums=('24eca1f22bbb0a88acbba321a4b1c4aa'
+         '6680338a8b23e7d651bb30cbba04e2b3'
+         '56276be014b3719442be10284729a4c3')
+
+prepare() {
+  cd "$srcdir/kicad-$pkgver"
+  # Remove on 4.0.5?  Or whenever they finally merge it.
+  patch -Np1 --binary -i ../boost-1.61.patch
+}
+
+build() {
+  cd "$srcdir/kicad-$pkgver"
+
+  mkdir -p build/Release
+  cd build/Release
+  cmake ../.. -DKICAD_STABLE_VERSION=ON     \
+              -DKICAD_REPO_NAME=stable      \
+              -DKICAD_BUILD_VERSION=$pkgver \
+              -DCMAKE_BUILD_TYPE=Release    \
+              -DCMAKE_INSTALL_PREFIX=/usr   \
+              -DKICAD_SKIP_BOOST=ON         \
+              -DKICAD_SCRIPTING=ON          \
+              -DKICAD_SCRIPTING_MODULES=ON  \
+              -DKICAD_SCRIPTING_WXPYTHON=ON \
+              -DBUILD_GITHUB_PLUGIN=ON
+  make
+
+  cd "$srcdir/kicad-i18n-$pkgver"
+  mkdir -p build/Release
+  cd build/Release
+  cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/kicad-$pkgver/build/Release"
+
+  make DESTDIR="$pkgdir" install
+
+  # copy updated linux icons
+  #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
+
+  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/boost-1.61.patch
===================================================================
--- community-x86_64/boost-1.61.patch	2017-03-11 11:53:15 UTC (rev 215651)
+++ community-x86_64/boost-1.61.patch	2017-03-11 11:53:39 UTC (rev 215652)
@@ -1,347 +0,0 @@
---- a/common/tool/tool_manager.cpp
-+++ b/common/tool/tool_manager.cpp
-@@ -532,11 +532,11 @@
-                     if( st->cofunc )
-                         st->Push();
- 
-+                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
-+
-                     // as the state changes, the transition table has to be set up again
-                     st->transitions.clear();
- 
--                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
--
-                     // got match? Run the handler.
-                     st->cofunc->Call( aEvent );
- 
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -27,10 +28,15 @@
- 
- #include <cstdlib>
- 
--#include <boost/context/fcontext.hpp>
- #include <boost/version.hpp>
-+#include <type_traits>
- 
--#include "delegate.h"
-+#if BOOST_VERSION <= 106000
-+#include <boost/context/fcontext.hpp>
-+#else
-+#include <boost/context/execution_context.hpp>
-+#include <boost/context/protected_fixedsize_stack.hpp>
-+#endif
- 
- /**
-  *  Class COROUNTINE.
-@@ -53,13 +59,12 @@
-  *  See coroutine_example.cpp for sample code.
-  */
- 
--template <class ReturnType, class ArgType>
-+template <typename ReturnType, typename ArgType>
- class COROUTINE
- {
- public:
-     COROUTINE() :
--        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
--        m_running( false )
-+        COROUTINE( nullptr )
-     {
-     }
- 
-@@ -69,8 +74,7 @@
-      */
-     template <class T>
-     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
--        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
-     {
-     }
- 
-@@ -78,9 +82,15 @@
-      * Constructor
-      * Creates a coroutine from a delegate object
-      */
--    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
--        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
-+        m_func( std::move( aEntry ) ),
-+        m_running( false ),
-+#if BOOST_VERSION <= 106000
-+        m_stack( nullptr ),
-+        m_stackSize( c_defaultStackSize ),
-+#endif
-+        m_caller( nullptr ),
-+        m_callee( nullptr )
-     {
-         // Avoid not initialized members, and make static analysers quiet
-         m_args = 0;
-@@ -89,18 +99,26 @@
- 
-     ~COROUTINE()
-     {
--        if( m_saved )
--            delete m_saved;
--
- #if BOOST_VERSION >= 105600
--        if( m_self )
--            delete m_self;
-+        delete m_callee;
- #endif
- 
-+#if BOOST_VERSION <= 106000
-+        delete m_caller;
-+
-         if( m_stack )
-             free( m_stack );
-+#endif
-     }
- 
-+private:
-+#if BOOST_VERSION <= 106000
-+    using context_type = boost::context::fcontext_t;
-+#else
-+    using context_type = boost::context::execution_context<COROUTINE*>;
-+#endif
-+
-+public:
-     /**
-      * Function Yield()
-      *
-@@ -110,7 +128,12 @@
-      */
-     void Yield()
-     {
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        auto result = (*m_caller)( this );
-+        *m_caller = std::move( std::get<0>( result ) );
-+#endif
-     }
- 
-     /**
-@@ -122,7 +145,11 @@
-     void Yield( ReturnType& aRetVal )
-     {
-         m_retVal = aRetVal;
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        m_caller( this );
-+#endif
-     }
- 
-     /**
-@@ -130,9 +157,9 @@
-      *
-      * Defines the entry point for the coroutine, if not set in the constructor.
-      */
--    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
-+    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
-     {
--        m_func = aEntry;
-+        m_func = std::move( aEntry );
-     }
- 
-     /* Function Call()
-@@ -143,6 +170,10 @@
-      */
-     bool Call( ArgType aArgs )
-     {
-+        assert( m_callee == NULL );
-+        assert( m_caller == NULL );
-+
-+#if BOOST_VERSION <= 106000
-         // fixme: Clean up stack stuff. Add a guard
-         m_stack = malloc( c_defaultStackSize );
- 
-@@ -151,22 +182,32 @@
- 
-         // correct the stack size
-         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
--
--        assert( m_self == NULL );
--        assert( m_saved == NULL );
-+#endif
- 
-         m_args = &aArgs;
--#if BOOST_VERSION >= 105600
--        m_self = new boost::context::fcontext_t();
--        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+
-+#if BOOST_VERSION < 105600
-+        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+#elif BOOST_VERSION <= 106000
-+        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
- #else
--        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+        m_callee = new context_type( std::allocator_arg_t(),
-+                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
-+#endif
-+
-+#if BOOST_VERSION <= 106000
-+        m_caller = new context_type();
- #endif
--        m_saved = new boost::context::fcontext_t();
- 
-         m_running = true;
-+
-         // off we go!
--        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
-         return m_running;
-     }
- 
-@@ -179,7 +220,12 @@
-      */
-     bool Resume()
-     {
--        jump( m_saved, m_self, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, false );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
- 
-         return m_running;
-     }
-@@ -208,61 +254,66 @@
-     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
- 
-     /* real entry point of the coroutine */
-+#if BOOST_VERSION <= 106000
-     static void callerStub( intptr_t aData )
-+#else
-+    static context_type callerStub( context_type caller, COROUTINE* cor )
-+#endif
-     {
-         // get pointer to self
-+#if BOOST_VERSION <= 106000
-         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
-+#else
-+        cor->m_caller = &caller;
-+#endif
- 
-         // call the coroutine method
--        cor->m_retVal = cor->m_func( *cor->m_args );
-+        cor->m_retVal = cor->m_func( *( cor->m_args ) );
-         cor->m_running = false;
- 
-         // go back to wherever we came from.
--        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
-+#if BOOST_VERSION <= 106000
-+        jump( cor->m_callee, cor->m_caller, 0 );
-+#else
-+        return caller;
-+#endif
-     }
- 
-     ///> 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,
-+#if BOOST_VERSION <= 106000
-+    static inline intptr_t jump( context_type* aOld, context_type* aNew,
-                                 intptr_t aP, bool aPreserveFPU = true )
-     {
--#if BOOST_VERSION >= 105600
--        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
-+#if BOOST_VERSION < 105600
-         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
-+#else
-+        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
- #endif
-     }
-+#endif
- 
--    template <typename T>
--    struct strip_ref
--    {
--        typedef T result;
--    };
-+    std::function<ReturnType(ArgType)> m_func;
- 
--    template <typename T>
--    struct strip_ref<T&>
--    {
--        typedef T result;
--    };
-+    bool m_running;
- 
--    DELEGATE<ReturnType, ArgType> m_func;
-+#if BOOST_VERSION <= 106000
-+    ///< coroutine stack
-+    void* m_stack;
-+
-+    size_t m_stackSize;
-+#endif
- 
-     ///< pointer to coroutine entry arguments. Stripped of references
-     ///< to avoid compiler errors.
--    typename strip_ref<ArgType>::result* m_args;
-+    typename std::remove_reference<ArgType>::type* m_args;
-+
-     ReturnType m_retVal;
- 
-     ///< saved caller context
--    boost::context::fcontext_t* m_saved;
-+    context_type* m_caller;
- 
-     ///< saved coroutine context
--    boost::context::fcontext_t* m_self;
--
--    ///< coroutine stack
--    void* m_stack;
--
--    size_t m_stackSize;
--
--    bool m_running;
-+    context_type* m_callee;
- };
- 
- #endif
---- a/include/tool/tool_base.h
-+++ b/include/tool/tool_base.h
-@@ -31,7 +32,7 @@
- #include <tool/tool_event.h>
- #include <tool/tool_settings.h>
- 
--#include <tool/delegate.h>
-+#include <functional>
- 
- class EDA_ITEM;
- class TOOL_MANAGER;
-@@ -53,7 +54,9 @@
- 
- /// Unique identifier for tools
- typedef int TOOL_ID;
--typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
-+
-+using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
-+
- 
- /**
-  * Class TOOL_BASE
---- a/include/tool/tool_interactive.h
-+++ b/include/tool/tool_interactive.h
-@@ -113,7 +114,7 @@
- void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
-                            const TOOL_EVENT_LIST& aConditions )
- {
--    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
-+    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
- 
-     goInternal( sptr, aConditions );
- }
-

Copied: kicad/repos/community-x86_64/boost-1.61.patch (from rev 215651, kicad/trunk/boost-1.61.patch)
===================================================================
--- community-x86_64/boost-1.61.patch	                        (rev 0)
+++ community-x86_64/boost-1.61.patch	2017-03-11 11:53:39 UTC (rev 215652)
@@ -0,0 +1,347 @@
+--- a/common/tool/tool_manager.cpp
++++ b/common/tool/tool_manager.cpp
+@@ -532,11 +532,11 @@
+                     if( st->cofunc )
+                         st->Push();
+ 
++                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
++
+                     // as the state changes, the transition table has to be set up again
+                     st->transitions.clear();
+ 
+-                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
+-
+                     // got match? Run the handler.
+                     st->cofunc->Call( aEvent );
+ 
+--- a/include/tool/coroutine.h
++++ b/include/tool/coroutine.h
+@@ -27,10 +28,15 @@
+ 
+ #include <cstdlib>
+ 
+-#include <boost/context/fcontext.hpp>
+ #include <boost/version.hpp>
++#include <type_traits>
+ 
+-#include "delegate.h"
++#if BOOST_VERSION <= 106000
++#include <boost/context/fcontext.hpp>
++#else
++#include <boost/context/execution_context.hpp>
++#include <boost/context/protected_fixedsize_stack.hpp>
++#endif
+ 
+ /**
+  *  Class COROUNTINE.
+@@ -53,13 +59,12 @@
+  *  See coroutine_example.cpp for sample code.
+  */
+ 
+-template <class ReturnType, class ArgType>
++template <typename ReturnType, typename ArgType>
+ class COROUTINE
+ {
+ public:
+     COROUTINE() :
+-        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
+-        m_running( false )
++        COROUTINE( nullptr )
+     {
+     }
+ 
+@@ -69,8 +74,7 @@
+      */
+     template <class T>
+     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
+-        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
+     {
+     }
+ 
+@@ -78,9 +82,15 @@
+      * Constructor
+      * Creates a coroutine from a delegate object
+      */
+-    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
+-        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
+-        m_stackSize( c_defaultStackSize ), m_running( false )
++    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
++        m_func( std::move( aEntry ) ),
++        m_running( false ),
++#if BOOST_VERSION <= 106000
++        m_stack( nullptr ),
++        m_stackSize( c_defaultStackSize ),
++#endif
++        m_caller( nullptr ),
++        m_callee( nullptr )
+     {
+         // Avoid not initialized members, and make static analysers quiet
+         m_args = 0;
+@@ -89,18 +99,26 @@
+ 
+     ~COROUTINE()
+     {
+-        if( m_saved )
+-            delete m_saved;
+-
+ #if BOOST_VERSION >= 105600
+-        if( m_self )
+-            delete m_self;
++        delete m_callee;
+ #endif
+ 
++#if BOOST_VERSION <= 106000
++        delete m_caller;
++
+         if( m_stack )
+             free( m_stack );
++#endif
+     }
+ 
++private:
++#if BOOST_VERSION <= 106000
++    using context_type = boost::context::fcontext_t;
++#else
++    using context_type = boost::context::execution_context<COROUTINE*>;
++#endif
++
++public:
+     /**
+      * Function Yield()
+      *
+@@ -110,7 +128,12 @@
+      */
+     void Yield()
+     {
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        auto result = (*m_caller)( this );
++        *m_caller = std::move( std::get<0>( result ) );
++#endif
+     }
+ 
+     /**
+@@ -122,7 +145,11 @@
+     void Yield( ReturnType& aRetVal )
+     {
+         m_retVal = aRetVal;
+-        jump( m_self, m_saved, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_callee, m_caller, false );
++#else
++        m_caller( this );
++#endif
+     }
+ 
+     /**
+@@ -130,9 +157,9 @@
+      *
+      * Defines the entry point for the coroutine, if not set in the constructor.
+      */
+-    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
++    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
+     {
+-        m_func = aEntry;
++        m_func = std::move( aEntry );
+     }
+ 
+     /* Function Call()
+@@ -143,6 +170,10 @@
+      */
+     bool Call( ArgType aArgs )
+     {
++        assert( m_callee == NULL );
++        assert( m_caller == NULL );
++
++#if BOOST_VERSION <= 106000
+         // fixme: Clean up stack stuff. Add a guard
+         m_stack = malloc( c_defaultStackSize );
+ 
+@@ -151,22 +182,32 @@
+ 
+         // correct the stack size
+         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
+-
+-        assert( m_self == NULL );
+-        assert( m_saved == NULL );
++#endif
+ 
+         m_args = &aArgs;
+-#if BOOST_VERSION >= 105600
+-        m_self = new boost::context::fcontext_t();
+-        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++
++#if BOOST_VERSION < 105600
++        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++#elif BOOST_VERSION <= 106000
++        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
+ #else
+-        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
++        m_callee = new context_type( std::allocator_arg_t(),
++                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
++#endif
++
++#if BOOST_VERSION <= 106000
++        m_caller = new context_type();
+ #endif
+-        m_saved = new boost::context::fcontext_t();
+ 
+         m_running = true;
++
+         // off we go!
+-        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+         return m_running;
+     }
+ 
+@@ -179,7 +220,12 @@
+      */
+     bool Resume()
+     {
+-        jump( m_saved, m_self, 0 );
++#if BOOST_VERSION <= 106000
++        jump( m_caller, m_callee, false );
++#else
++        auto result = (*m_callee)( this );
++        *m_callee = std::move( std::get<0>( result ) );
++#endif
+ 
+         return m_running;
+     }
+@@ -208,61 +254,66 @@
+     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
+ 
+     /* real entry point of the coroutine */
++#if BOOST_VERSION <= 106000
+     static void callerStub( intptr_t aData )
++#else
++    static context_type callerStub( context_type caller, COROUTINE* cor )
++#endif
+     {
+         // get pointer to self
++#if BOOST_VERSION <= 106000
+         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
++#else
++        cor->m_caller = &caller;
++#endif
+ 
+         // call the coroutine method
+-        cor->m_retVal = cor->m_func( *cor->m_args );
++        cor->m_retVal = cor->m_func( *( cor->m_args ) );
+         cor->m_running = false;
+ 
+         // go back to wherever we came from.
+-        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
++#if BOOST_VERSION <= 106000
++        jump( cor->m_callee, cor->m_caller, 0 );
++#else
++        return caller;
++#endif
+     }
+ 
+     ///> 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,
++#if BOOST_VERSION <= 106000
++    static inline intptr_t jump( context_type* aOld, context_type* aNew,
+                                 intptr_t aP, bool aPreserveFPU = true )
+     {
+-#if BOOST_VERSION >= 105600
+-        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+-#else
++#if BOOST_VERSION < 105600
+         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
++#else
++        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
+ #endif
+     }
++#endif
+ 
+-    template <typename T>
+-    struct strip_ref
+-    {
+-        typedef T result;
+-    };
++    std::function<ReturnType(ArgType)> m_func;
+ 
+-    template <typename T>
+-    struct strip_ref<T&>
+-    {
+-        typedef T result;
+-    };
++    bool m_running;
+ 
+-    DELEGATE<ReturnType, ArgType> m_func;
++#if BOOST_VERSION <= 106000
++    ///< coroutine stack
++    void* m_stack;
++
++    size_t m_stackSize;
++#endif
+ 
+     ///< pointer to coroutine entry arguments. Stripped of references
+     ///< to avoid compiler errors.
+-    typename strip_ref<ArgType>::result* m_args;
++    typename std::remove_reference<ArgType>::type* m_args;
++
+     ReturnType m_retVal;
+ 
+     ///< saved caller context
+-    boost::context::fcontext_t* m_saved;
++    context_type* m_caller;
+ 
+     ///< saved coroutine context
+-    boost::context::fcontext_t* m_self;
+-
+-    ///< coroutine stack
+-    void* m_stack;
+-
+-    size_t m_stackSize;
+-
+-    bool m_running;
++    context_type* m_callee;
+ };
+ 
+ #endif
+--- a/include/tool/tool_base.h
++++ b/include/tool/tool_base.h
+@@ -31,7 +32,7 @@
+ #include <tool/tool_event.h>
+ #include <tool/tool_settings.h>
+ 
+-#include <tool/delegate.h>
++#include <functional>
+ 
+ class EDA_ITEM;
+ class TOOL_MANAGER;
+@@ -53,7 +54,9 @@
+ 
+ /// Unique identifier for tools
+ typedef int TOOL_ID;
+-typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
++
++using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
++
+ 
+ /**
+  * Class TOOL_BASE
+--- a/include/tool/tool_interactive.h
++++ b/include/tool/tool_interactive.h
+@@ -113,7 +114,7 @@
+ void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
+                            const TOOL_EVENT_LIST& aConditions )
+ {
+-    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
++    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
+ 
+     goInternal( sptr, aConditions );
+ }
+


More information about the arch-commits mailing list