Index: head/cad/Makefile
===================================================================
--- head/cad/Makefile (revision 446083)
+++ head/cad/Makefile (revision 446084)
@@ -1,97 +1,99 @@
# $FreeBSD$
#
COMMENT = CAD tools
SUBDIR += NASTRAN-95
SUBDIR += admesh
SUBDIR += adms
SUBDIR += alliance
SUBDIR += astk-client
SUBDIR += astk-serveur
SUBDIR += atlc
SUBDIR += basicdsp
SUBDIR += brickutils
SUBDIR += brlcad
SUBDIR += calculix
SUBDIR += cascade
SUBDIR += chipvault
SUBDIR += cider
SUBDIR += cura-engine
SUBDIR += dinotrace
SUBDIR += dxf2fig
SUBDIR += electric
SUBDIR += electric-ng
SUBDIR += elmerfem
SUBDIR += feappv
SUBDIR += fidocadj
SUBDIR += freecad
SUBDIR += freehdl
SUBDIR += fritzing
SUBDIR += gdsreader
SUBDIR += gdt
SUBDIR += geda
SUBDIR += gerbv
SUBDIR += ghdl
SUBDIR += gmsh
SUBDIR += gmsh-occ
SUBDIR += gnucap
SUBDIR += gplcver
SUBDIR += gspiceui
SUBDIR += gtkwave
SUBDIR += impact
SUBDIR += irsim
SUBDIR += iverilog
SUBDIR += jspice3
SUBDIR += kicad
SUBDIR += kicad-devel
+ SUBDIR += kicad-library
SUBDIR += klayout
SUBDIR += layouteditor
SUBDIR += ldraw
SUBDIR += leocad
SUBDIR += libopencad
SUBDIR += librecad
SUBDIR += linux-eagle5
SUBDIR += linuxcnc-devel
SUBDIR += logisim
SUBDIR += magic
SUBDIR += meshdev
SUBDIR += meshlab
+ SUBDIR += mfront
SUBDIR += netgen
SUBDIR += ngspice_rework
SUBDIR += opencascade
SUBDIR += openscad
SUBDIR += openvsp
SUBDIR += p5-GDS2
SUBDIR += p5-Verilog-Perl
SUBDIR += pcb
SUBDIR += pdnmesh
SUBDIR += py-gdspy
SUBDIR += py-lcapy
SUBDIR += py-pycam
SUBDIR += python-gdsii
SUBDIR += pythoncad
SUBDIR += qcad
SUBDIR += qelectrotech
SUBDIR += qfsm
SUBDIR += qmls
SUBDIR += qucs
SUBDIR += repsnapper
SUBDIR += rubygem-gdsii
SUBDIR += sceptre
SUBDIR += scotch
SUBDIR += solvespace
SUBDIR += sp2sp
SUBDIR += spice
SUBDIR += stepcode
SUBDIR += sweethome3d
SUBDIR += tkgate
SUBDIR += tochnog
SUBDIR += transcalc
SUBDIR += varkon
SUBDIR += verilog-mode.el
SUBDIR += xcircuit
SUBDIR += z88
SUBDIR += zcad
.include
Index: head/cad/kicad/Makefile
===================================================================
--- head/cad/kicad/Makefile (revision 446083)
+++ head/cad/kicad/Makefile (revision 446084)
@@ -1,85 +1,75 @@
# Created by: Thierry Thomas
# $FreeBSD$
PORTNAME= kicad
-DISTVERSION= 20140622%2Bbzr4027
-PORTREVISION= 9
-PORTEPOCH= 1
+PORTVERSION= 4.0.7
+PORTEPOCH= 2
CATEGORIES= cad
-MASTER_SITES= https://launchpadlibrarian.net/179199115/
-DISTNAME= ${PORTNAME}_0.${DISTVERSION}.orig
MAINTAINER= thierry@FreeBSD.org
COMMENT= Schematic and PCB editing software
LICENSE= GPLv2
-LIB_DEPENDS= libboost_thread.so:devel/boost-libs
+BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm \
+ swig3.0:devel/swig30
+LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
+ libpixman-1.so:x11/pixman \
+ libpng.so:graphics/png \
+ libcurl.so:ftp/curl
RUN_DEPENDS= xpdf:graphics/xpdf
-CONFLICTS= kicad-devel*
+CONFLICTS= kicad-devel-r201*
-USES= cmake:noninja compiler:gcc-c++11-lib desktop-file-utils dos2unix \
- shared-mime-info tar:xz
+USE_GITHUB= yes
+GH_ACCOUNT= KiCad
+GH_PROJECT= kicad-source-mirror
-DOS2UNIX_GLOB= *.cmake sch_bus_entry.h sch_line.h sch_no_connect.h
+USES= cmake:noninja compiler:c++11-lib desktop-file-utils \
+ pkgconfig python shared-mime-info shebangfix ssl tar:xz
+SHEBANG_FILES= pcbnew/scripting/plugins/touch_slider_wizard.py
+
USE_XORG= ice x11 xext
-USE_GL= yes
+USE_GL= gl glew glu glut
USE_WX= 3.0
-USE_GNOME= atk # Required by libwx_gtk2_aui-2.8.so
-CXXFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -DBOOST_HASH_NO_EXTENSIONS
-CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \
- -DwxUSE_UNICODE=ON -DKICAD_STABLE_VERSION=ON \
- -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}
+WX_COMPS= python:lib wx
+USE_GNOME= atk cairo
+CXXFLAGS+= --std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
+CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} \
+ -DwxWidgets_USE_UNICODE=ON -DKICAD_STABLE_VERSION=ON \
+ -DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
+ -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON \
+ -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SKIP_BOOST=ON
INSTALLS_ICONS= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}-0.${DISTVERSION:C/%2B/+/}
-
PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
OPTIONS_DEFINE= DOCS DOXYGEN NLS
OPTIONS_SUB= yes
-NLS_USES= gettext
+NLS_USES= gettext
BINS= cvpcb eeschema gerbview kicad pcbnew
EXTRAS2RM= linux-non_unicode linux wings3d LINUX.README \
contrib_makefiles.txt running_kicad_under_W98.txt
DOXYGEN_VARS= LICENSE+=GFDL LICENSE_COMB=multi
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_IMPLIES= DOCS
DOXYGEN_ALL_TARGET= all doxygen-docs
DOXYGEN_PORTDOCS= doxygen
-post-patch:
- ${MV} ${WRKSRC}/include/boost ${WRKSRC}/include/boost.orig
-
pre-configure:
${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|' \
-e 's|/usr/local|${PREFIX}|' \
-e 's|/usr/bin/evince|${LOCALBASE}/bin/xpdf|' \
-e 's|/usr/bin/kpdf|${LOCALBASE}/bin/okular|' \
-e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \
-e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \
-e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
${WRKSRC}/common/gestfich.cpp
-post-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}
- (cd ${WRKSRC}/library && ${COPYTREE_SHARE} library ${STAGEDIR}${DATADIR})
- (cd ${WRKSRC}/library && ${COPYTREE_SHARE} modules ${STAGEDIR}${DATADIR})
-
-post-install-NLS-on:
- ${MKDIR} ${STAGEDIR}${DATADIR}/internat
- (cd ${WRKSRC}/doc/internat && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/internat)
- ${RM} ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt
- ${FIND} ${STAGEDIR}${DATADIR}/internat -name kicad.po -delete
-
post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC}/doc/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
.include
Index: head/cad/kicad/distinfo
===================================================================
--- head/cad/kicad/distinfo (revision 446083)
+++ head/cad/kicad/distinfo (revision 446084)
@@ -1,2 +1,3 @@
-SHA256 (kicad_0.20140622%2Bbzr4027.orig.tar.xz) = 05a05e42d16ece17326544cef16fe720836930b99266f99a2aa0db7c9a0cbdf2
-SIZE (kicad_0.20140622%2Bbzr4027.orig.tar.xz) = 161275016
+TIMESTAMP = 1500213571
+SHA256 (KiCad-kicad-source-mirror-4.0.7_GH0.tar.gz) = 157ccd3967d93863e4c3dd718bc96273d5e1846303f3c156df52456e92656025
+SIZE (KiCad-kicad-source-mirror-4.0.7_GH0.tar.gz) = 14420680
Index: head/cad/kicad/files/patch-eeschema_sch_text.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_text.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_text.h (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_text.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_text.h 2014-05-01 18:27:31.000000000 +0200
-@@ -188,7 +188,7 @@
-
- virtual bool IsSelectStateChanged( const wxRect& aRect );
-
-- virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- virtual bool CanIncrementLabel() const { return true; }
-
-@@ -196,7 +196,7 @@
-
- virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
-
-- virtual void GetNetListItem( vector& aNetListItems,
-+ virtual void GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath );
-
- virtual wxPoint GetPosition() const { return m_Pos; }
Property changes on: head/cad/kicad/files/patch-eeschema_sch_text.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_junction.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_junction.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_junction.cpp (nonexistent)
@@ -1,18 +0,0 @@
---- eeschema/sch_junction.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_junction.cpp 2014-05-01 18:52:54.000000000 +0200
-@@ -172,13 +172,13 @@
- }
-
-
--void SCH_JUNCTION::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_JUNCTION::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- aPoints.push_back( m_pos );
- }
-
-
--void SCH_JUNCTION::GetNetListItem( vector& aNetListItems,
-+void SCH_JUNCTION::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- NETLIST_OBJECT* item = new NETLIST_OBJECT();
Property changes on: head/cad/kicad/files/patch-eeschema_sch_junction.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_no_connect.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_no_connect.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_no_connect.h (nonexistent)
@@ -1,18 +0,0 @@
---- eeschema/sch_no_connect.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_no_connect.h 2014-05-01 18:25:21.000000000 +0200
-@@ -80,13 +80,13 @@
-
- bool IsConnectable() const { return true; }
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); }
-
- BITMAP_DEF GetMenuImage() const { return noconn_xpm; }
-
-- void GetNetListItem( vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-
- wxPoint GetPosition() const { return m_pos; }
-
Property changes on: head/cad/kicad/files/patch-eeschema_sch_no_connect.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_junction.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_junction.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_junction.h (nonexistent)
@@ -1,18 +0,0 @@
---- eeschema/sch_junction.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_junction.h 2014-05-01 18:31:15.000000000 +0200
-@@ -78,13 +78,13 @@
-
- bool IsConnectable() const { return true; }
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); }
-
- BITMAP_DEF GetMenuImage() const { return add_junction_xpm; }
-
-- void GetNetListItem( vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-
- wxPoint GetPosition() const { return m_pos; }
-
Property changes on: head/cad/kicad/files/patch-eeschema_sch_junction.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-kicad_project_template.h
===================================================================
--- head/cad/kicad/files/patch-kicad_project_template.h (revision 446083)
+++ head/cad/kicad/files/patch-kicad_project_template.h (nonexistent)
@@ -1,11 +0,0 @@
---- kicad/project_template.h.orig 2013-04-11 08:10:30.000000000 +0200
-+++ kicad/project_template.h 2014-05-02 10:31:54.000000000 +0200
-@@ -200,7 +200,7 @@
- * @brief Get a vector list of filenames for the template. The files are the source files,
- * and have not yet been through any renaming
- */
-- vector GetFileList();
-+ std::vector GetFileList();
- };
-
- #endif
Property changes on: head/cad/kicad/files/patch-kicad_project_template.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_sheet.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_sheet.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_sheet.h (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_sheet.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_sheet.h 2014-05-01 18:23:35.000000000 +0200
-@@ -532,7 +532,7 @@
-
- bool IsConnectable() const { return true; }
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints(std::vector< wxPoint >& aPoints ) const;
-
- SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
- const KICAD_T scanTypes[] );
-@@ -541,7 +541,7 @@
-
- BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; }
-
-- void GetNetListItem( vector& aNetListItems,
-+ void GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath );
-
- SCH_ITEM& operator=( const SCH_ITEM& aSheet );
Property changes on: head/cad/kicad/files/patch-eeschema_sch_sheet.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_sch_item_struct.h
===================================================================
--- head/cad/kicad/files/patch-include_sch_item_struct.h (revision 446083)
+++ head/cad/kicad/files/patch-include_sch_item_struct.h (nonexistent)
@@ -1,47 +0,0 @@
---- include/sch_item_struct.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ include/sch_item_struct.h 2014-05-01 17:32:49.000000000 +0200
-@@ -47,7 +47,7 @@
-
- typedef boost::ptr_vector< SCH_ITEM > SCH_ITEMS;
- typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
--typedef vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
-+typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
-
-
- #define FMT_IU SCH_ITEM::FormatInternalUnits
-@@ -228,7 +228,7 @@
- *
- * @param aItemList - List of DANGLING_END_ITEMS to add to.
- */
-- virtual void GetEndPoints( vector< DANGLING_END_ITEM >& aItemList ) {}
-+ virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) {}
-
- /**
- * Function IsDanglingStateChanged
-@@ -243,7 +243,7 @@
- * @param aItemList - List of items to test item against.
- * @return True if the dangling state has changed from it's current setting.
- */
-- virtual bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList ) { return false; }
-+ virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) { return false; }
-
- virtual bool IsDangling() const { return false; }
-
-@@ -273,7 +273,7 @@
- *
- * @param aPoints List of connection points to add to.
- */
-- virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const { }
-+ virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const { }
-
- /**
- * Function ClearConnections
-@@ -340,7 +340,7 @@
- * net list objects associated with them.
- *
- */
-- virtual void GetNetListItem( vector& aNetListItems,
-+ virtual void GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath ) { }
-
- /**
Property changes on: head/cad/kicad/files/patch-include_sch_item_struct.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp (nonexistent)
@@ -1,11 +0,0 @@
---- eeschema/sch_bus_entry.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_bus_entry.cpp 2014-05-01 18:42:56.000000000 +0200
-@@ -244,7 +244,7 @@
- }
-
-
--void SCH_BUS_ENTRY::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_BUS_ENTRY::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- aPoints.push_back( m_pos );
- aPoints.push_back( m_End() );
Property changes on: head/cad/kicad/files/patch-eeschema_sch_bus_entry.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_component.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_component.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_component.cpp (nonexistent)
@@ -1,29 +0,0 @@
---- eeschema/sch_component.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_component.cpp 2014-05-01 18:45:07.000000000 +0200
-@@ -1622,7 +1622,7 @@
- }
-
-
--void SCH_COMPONENT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_COMPONENT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- LIB_PIN* pin;
- LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
-@@ -1738,7 +1738,7 @@
- }
-
-
--void SCH_COMPONENT::GetNetListItem( vector& aNetListItems,
-+void SCH_COMPONENT::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( GetLibName() );
-@@ -1893,7 +1893,7 @@
-
- bool SCH_COMPONENT::doIsConnected( const wxPoint& aPosition ) const
- {
-- vector< wxPoint > pts;
-+ std::vector< wxPoint > pts;
-
- GetConnectionPoints( pts );
-
Property changes on: head/cad/kicad/files/patch-eeschema_sch_component.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp (nonexistent)
@@ -1,18 +0,0 @@
---- eeschema/sch_no_connect.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_no_connect.cpp 2014-05-01 18:56:25.000000000 +0200
-@@ -182,13 +182,13 @@
- }
-
-
--void SCH_NO_CONNECT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_NO_CONNECT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- aPoints.push_back( m_pos );
- }
-
-
--void SCH_NO_CONNECT::GetNetListItem( vector& aNetListItems,
-+void SCH_NO_CONNECT::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- NETLIST_OBJECT* item = new NETLIST_OBJECT();
Property changes on: head/cad/kicad/files/patch-eeschema_sch_no_connect.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-CMakeLists.txt
===================================================================
--- head/cad/kicad/files/patch-CMakeLists.txt (revision 446083)
+++ head/cad/kicad/files/patch-CMakeLists.txt (nonexistent)
@@ -1,13 +0,0 @@
---- CMakeLists.txt.orig 2013-04-03 18:23:36.000000000 +0200
-+++ CMakeLists.txt 2014-05-01 14:49:27.000000000 +0200
-@@ -260,8 +260,8 @@
- # kicad now includes needed boost files.
- # the two next lines can be uncommented to use the native boost lib.
- # but this is not a good idea
--#find_package(Boost 1.36 QUIET)
--#check_find_package_result(Boost_FOUND "Boost")
-+find_package(Boost 1.36 QUIET)
-+check_find_package_result(Boost_FOUND "Boost")
-
- ##########################
- # Find wxWidgets library #
Property changes on: head/cad/kicad/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h
===================================================================
--- head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h (revision 446083)
+++ head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h (nonexistent)
@@ -1,11 +0,0 @@
---- kicad/dialogs/dialog_template_selector.h.orig 2012-12-18 16:03:30.000000000 +0100
-+++ kicad/dialogs/dialog_template_selector.h 2014-05-02 10:30:14.000000000 +0200
-@@ -72,7 +72,7 @@
- class DIALOG_TEMPLATE_SELECTOR : public DIALOG_TEMPLATE_SELECTOR_BASE
- {
- protected:
-- vector m_panels;
-+ std::vector m_panels;
- void AddTemplate( int aPage, PROJECT_TEMPLATE* aTemplate );
- TEMPLATE_WIDGET* m_selectedWidget;
-
Property changes on: head/cad/kicad/files/patch-kicad_dialogs_dialog_template_selector.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_line.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_line.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_line.cpp (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_line.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_line.cpp 2014-05-01 18:54:48.000000000 +0200
-@@ -467,7 +467,7 @@
- }
-
-
--void SCH_LINE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_LINE::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- aPoints.push_back( m_start );
- aPoints.push_back( m_end );
-@@ -522,7 +522,7 @@
- }
-
-
--void SCH_LINE::GetNetListItem( vector& aNetListItems,
-+void SCH_LINE::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- // Net list item not required for graphic lines.
Property changes on: head/cad/kicad/files/patch-eeschema_sch_line.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-common_edaappl.cpp
===================================================================
--- head/cad/kicad/files/patch-common_edaappl.cpp (revision 446083)
+++ head/cad/kicad/files/patch-common_edaappl.cpp (nonexistent)
@@ -1,11 +0,0 @@
---- common/edaappl.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ common/edaappl.cpp 2014-05-01 17:52:47.000000000 +0200
-@@ -451,7 +451,7 @@
-
- // Linux and Unix
- #elif defined(__UNIX__)
-- m_BinDir = wxStandardPaths().GetExecutablePath();
-+ m_BinDir = wxStandardPaths::Get().GetExecutablePath();
- #else
- m_BinDir = argv[0];
- #endif // __UNIX__
Property changes on: head/cad/kicad/files/patch-common_edaappl.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_sheet.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_sheet.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_sheet.cpp (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_sheet.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_sheet.cpp 2014-05-01 18:58:07.000000000 +0200
-@@ -1000,7 +1000,7 @@
- }
-
-
--void SCH_SHEET::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_SHEET::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- for( size_t i = 0; i < GetPins().size(); i++ )
- aPoints.push_back( GetPins()[i].m_Pos );
-@@ -1072,7 +1072,7 @@
- }
-
-
--void SCH_SHEET::GetNetListItem( vector& aNetListItems,
-+void SCH_SHEET::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- SCH_SHEET_PATH sheetPath = *aSheetPath;
Property changes on: head/cad/kicad/files/patch-eeschema_sch_sheet.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_bus_entry.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_bus_entry.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_bus_entry.h (nonexistent)
@@ -1,11 +0,0 @@
---- eeschema/sch_bus_entry.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_bus_entry.h 2014-05-01 18:21:38.000000000 +0200
-@@ -114,7 +114,7 @@
-
- bool IsConnectable() const { return true; }
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- wxString GetSelectMenuText() const;
-
Property changes on: head/cad/kicad/files/patch-eeschema_sch_bus_entry.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_component.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_component.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_component.h (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_component.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_component.h 2014-05-01 18:17:42.000000000 +0200
-@@ -350,7 +350,7 @@
-
- bool IsConnectable() const { return true; }
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
- const KICAD_T scanTypes[] );
-@@ -369,7 +369,7 @@
-
- BITMAP_DEF GetMenuImage() const { return add_component_xpm; }
-
-- void GetNetListItem( vector& aNetListItems,
-+ void GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath );
-
- bool operator <( const SCH_ITEM& aItem ) const;
Property changes on: head/cad/kicad/files/patch-eeschema_sch_component.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_text.cpp
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_text.cpp (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_text.cpp (nonexistent)
@@ -1,20 +0,0 @@
---- eeschema/sch_text.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_text.cpp 2014-05-01 18:59:57.000000000 +0200
-@@ -564,7 +564,7 @@
- }
-
-
--void SCH_TEXT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
-+void SCH_TEXT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
- {
- // Normal text labels do not have connection points. All others do.
- if( Type() == SCH_TEXT_T )
-@@ -613,7 +613,7 @@
- }
-
-
--void SCH_TEXT::GetNetListItem( vector& aNetListItems,
-+void SCH_TEXT::GetNetListItem( std::vector& aNetListItems,
- SCH_SHEET_PATH* aSheetPath )
- {
- if( GetLayer() == LAYER_NOTES || GetLayer() == LAYER_SHEETLABEL )
Property changes on: head/cad/kicad/files/patch-eeschema_sch_text.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-eeschema_sch_ine.h
===================================================================
--- head/cad/kicad/files/patch-eeschema_sch_ine.h (revision 446083)
+++ head/cad/kicad/files/patch-eeschema_sch_ine.h (nonexistent)
@@ -1,30 +0,0 @@
---- eeschema/sch_line.h.orig 2013-03-09 21:07:56.000000000 +0100
-+++ eeschema/sch_line.h 2014-05-01 18:29:35.000000000 +0200
-@@ -113,9 +113,9 @@
- */
- bool MergeOverlap( SCH_LINE* aLine );
-
-- void GetEndPoints( vector & aItemList );
-+ void GetEndPoints( std::vector & aItemList );
-
-- bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList );
-+ bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
-
- bool IsDangling() const { return m_startIsDangling || m_endIsDangling; }
-
-@@ -123,13 +123,13 @@
-
- bool IsConnectable() const;
-
-- void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
-+ void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
-
- wxString GetSelectMenuText() const;
-
- BITMAP_DEF GetMenuImage() const;
-
-- void GetNetListItem( vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-+ void GetNetListItem( std::vector& aNetListItems, SCH_SHEET_PATH* aSheetPath );
-
- bool operator <( const SCH_ITEM& aItem ) const;
-
Property changes on: head/cad/kicad/files/patch-eeschema_sch_ine.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-common_gr_basic.cpp
===================================================================
--- head/cad/kicad/files/patch-common_gr_basic.cpp (revision 446083)
+++ head/cad/kicad/files/patch-common_gr_basic.cpp (nonexistent)
@@ -1,11 +0,0 @@
---- common/gr_basic.cpp.orig 2013-03-09 21:07:56.000000000 +0100
-+++ common/gr_basic.cpp 2014-05-01 18:03:48.000000000 +0200
-@@ -1390,7 +1390,7 @@
- }
-
- // A clip box exists: clip and draw the polygon.
-- static vector clippedPolygon;
-+ static std::vector clippedPolygon;
- static pointVector inputPolygon, outputPolygon;
-
- inputPolygon.clear();
Property changes on: head/cad/kicad/files/patch-common_gr_basic.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h
===================================================================
--- head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h (revision 446083)
+++ head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h (nonexistent)
@@ -1,15 +0,0 @@
---- polygon/SutherlandHodgmanClipPoly.h.orig 2013-03-09 20:51:52.000000000 +0100
-+++ polygon/SutherlandHodgmanClipPoly.h 2014-05-01 18:01:22.000000000 +0200
-@@ -80,9 +80,9 @@
-
- #endif // _GDIPLUS_H
-
--typedef vector pointVector;
--typedef vector::iterator pointIterator;
--typedef vector::const_iterator cpointIterator;
-+typedef std::vector pointVector;
-+typedef std::vector::iterator pointIterator;
-+typedef std::vector::const_iterator cpointIterator;
-
- class SutherlandHodgman
- {
Property changes on: head/cad/kicad/files/patch-polygon_SutherlandHodgmanClipPoly.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-CMakeModules_FindwxWidgets.cmake
===================================================================
--- head/cad/kicad/files/patch-CMakeModules_FindwxWidgets.cmake (revision 446083)
+++ head/cad/kicad/files/patch-CMakeModules_FindwxWidgets.cmake (nonexistent)
@@ -1,21 +0,0 @@
---- CMakeModules/FindwxWidgets.cmake.orig 2014-05-01 12:04:10.000000000 +0200
-+++ CMakeModules/FindwxWidgets.cmake 2014-05-01 12:04:10.000000000 +0200
-@@ -143,13 +143,14 @@
- #
- # Helper macro to control the debugging output globally. There are
- # two versions for controlling how verbose your output should be.
-+# FreeBSD: enable debug to catch some strange behaviours...
- MACRO(DBG_MSG _MSG)
--# MESSAGE(STATUS
--# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-+ MESSAGE(STATUS
-+ "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
- ENDMACRO(DBG_MSG)
- MACRO(DBG_MSG_V _MSG)
--# MESSAGE(STATUS
--# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
-+ MESSAGE(STATUS
-+ "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
- ENDMACRO(DBG_MSG_V)
-
- # Clear return values in case the module is loaded more than once.
Property changes on: head/cad/kicad/files/patch-CMakeModules_FindwxWidgets.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-CMakeModules_config.h.cmake
===================================================================
--- head/cad/kicad/files/patch-CMakeModules_config.h.cmake (revision 446083)
+++ head/cad/kicad/files/patch-CMakeModules_config.h.cmake (revision 446084)
@@ -1,11 +1,11 @@
---- ./CMakeModules/config.h.cmake.orig 2010-04-13 20:11:02.000000000 +0200
-+++ ./CMakeModules/config.h.cmake 2010-05-23 14:54:37.000000000 +0200
-@@ -32,7 +32,7 @@
+--- CMakeModules/config.h.cmake.orig 2017-07-14 19:17:29 UTC
++++ CMakeModules/config.h.cmake
+@@ -36,7 +36,7 @@
#cmakedefine HAVE_ISO646_H
#if defined( HAVE_ISO646_H )
-#include
+#include
#endif
- #cmakedefine HAVE_STRINGS_H
+ #if defined( HAVE_STRCASECMP )
Index: head/cad/kicad/files/patch-common_tool_tool__manager.cpp
===================================================================
--- head/cad/kicad/files/patch-common_tool_tool__manager.cpp (nonexistent)
+++ head/cad/kicad/files/patch-common_tool_tool__manager.cpp (revision 446084)
@@ -0,0 +1,25 @@
+--- common/tool/tool_manager.cpp.orig 2017-07-14 19:17:29 UTC
++++ common/tool/tool_manager.cpp
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+@@ -542,11 +543,12 @@ void TOOL_MANAGER::dispatchInternal( con
+ if( st->cofunc )
+ st->Push();
+
++// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad
++ st->cofunc = new COROUTINE( tr.second );
++
+ // as the state changes, the transition table has to be set up again
+ st->transitions.clear();
+
+- st->cofunc = new COROUTINE( tr.second );
+-
+ // got match? Run the handler.
+ st->cofunc->Call( aEvent );
+
Property changes on: head/cad/kicad/files/patch-common_tool_tool__manager.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_common.h
===================================================================
--- head/cad/kicad/files/patch-include_common.h (nonexistent)
+++ head/cad/kicad/files/patch-include_common.h (revision 446084)
@@ -0,0 +1,11 @@
+--- include/common.h.orig 2017-07-14 19:17:29 UTC
++++ include/common.h
+@@ -54,7 +54,7 @@ class REPORTER;
+ #define GR_KB_LEFTSHIFT 0x20000000 /* left shift key depressed
+ */
+ #define GR_KB_CTRL 0x40000000 // CTRL depressed
+-#define GR_KB_ALT 0x80000000 // ALT depressed
++#define GR_KB_ALT 0x04000000 // ALT depressed
+ #define GR_KB_SHIFT (GR_KB_LEFTSHIFT | GR_KB_RIGHTSHIFT)
+ #define GR_KB_SHIFTCTRL (GR_KB_SHIFT | GR_KB_CTRL)
+ #define MOUSE_MIDDLE 0x08000000 /* Middle button mouse
Property changes on: head/cad/kicad/files/patch-include_common.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_tool_coroutine.h
===================================================================
--- head/cad/kicad/files/patch-include_tool_coroutine.h (nonexistent)
+++ head/cad/kicad/files/patch-include_tool_coroutine.h (revision 446084)
@@ -0,0 +1,235 @@
+--- include/tool/coroutine.h.orig 2017-07-14 19:17:29 UTC
++++ include/tool/coroutine.h
+@@ -27,10 +27,12 @@
+
+ #include
+
+-#include
++// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad
+ #include
++#include
+
+-#include "delegate.h"
++#include
++#include
+
+ /**
+ * Class COROUNTINE.
+@@ -53,13 +55,12 @@
+ * See coroutine_example.cpp for sample code.
+ */
+
+-template
++template
+ class COROUTINE
+ {
+ public:
+ COROUTINE() :
+- m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
+- m_running( false )
++ COROUTINE( nullptr )
+ {
+ }
+
+@@ -69,8 +70,7 @@ public:
+ */
+ template
+ 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 +78,11 @@ public:
+ * Constructor
+ * Creates a coroutine from a delegate object
+ */
+- COROUTINE( DELEGATE aEntry ) :
+- m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
+- m_stackSize( c_defaultStackSize ), m_running( false )
++ COROUTINE( std::function aEntry ) :
++ m_func( std::move( aEntry ) ),
++ m_running( false ),
++ m_caller( nullptr ),
++ m_callee( nullptr )
+ {
+ // Avoid not initialized members, and make static analysers quiet
+ m_args = 0;
+@@ -89,18 +91,13 @@ public:
+
+ ~COROUTINE()
+ {
+- if( m_saved )
+- delete m_saved;
+-
+-#if BOOST_VERSION >= 105600
+- if( m_self )
+- delete m_self;
+-#endif
+-
+- if( m_stack )
+- free( m_stack );
++ delete m_callee;
+ }
+
++private:
++ using context_type = boost::context::execution_context;
++
++public:
+ /**
+ * Function Yield()
+ *
+@@ -110,7 +107,9 @@ public:
+ */
+ void Yield()
+ {
+- jump( m_self, m_saved, 0 );
++ auto result = (*m_caller)( this );
++ *m_caller = std::move( std::get<0>( result ) );
++
+ }
+
+ /**
+@@ -122,7 +121,7 @@ public:
+ void Yield( ReturnType& aRetVal )
+ {
+ m_retVal = aRetVal;
+- jump( m_self, m_saved, 0 );
++ m_caller( this );
+ }
+
+ /**
+@@ -130,9 +129,9 @@ public:
+ *
+ * Defines the entry point for the coroutine, if not set in the constructor.
+ */
+- void SetEntry( DELEGATE aEntry )
++ void SetEntry( std::function aEntry )
+ {
+- m_func = aEntry;
++ m_func = std::move( aEntry );
+ }
+
+ /* Function Call()
+@@ -143,30 +142,19 @@ public:
+ */
+ bool Call( ArgType aArgs )
+ {
+- // fixme: Clean up stack stuff. Add a guard
+- m_stack = malloc( c_defaultStackSize );
+-
+- // align to 16 bytes
+- void* sp = (void*) ( ( ( (ptrdiff_t) m_stack ) + m_stackSize - 0xf ) & ( ~0x0f ) );
+-
+- // correct the stack size
+- m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
+-
+- assert( m_self == NULL );
+- assert( m_saved == NULL );
++ assert( m_callee == NULL );
++ assert( m_caller == 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_callee = new context_type( std::allocator_arg_t(),
++ boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
+
+ m_running = true;
++
+ // off we go!
+- jump( m_saved, m_self, reinterpret_cast( this ) );
++ auto result = (*m_callee)( this );
++ *m_callee = std::move( std::get<0>( result ) );
+ return m_running;
+ }
+
+@@ -179,7 +167,8 @@ public:
+ */
+ bool Resume()
+ {
+- jump( m_saved, m_self, 0 );
++ auto result = (*m_callee)( this );
++ *m_callee = std::move( std::get<0>( result ) );
+
+ return m_running;
+ }
+@@ -208,61 +197,36 @@ private:
+ static const int c_defaultStackSize = 2000000; // fixme: make configurable
+
+ /* real entry point of the coroutine */
+- static void callerStub( intptr_t aData )
++ static context_type callerStub( context_type caller, COROUTINE* cor )
+ {
+ // get pointer to self
+- COROUTINE* cor = reinterpret_cast*>( aData );
++ cor->m_caller = &caller;
+
+ // 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( this ));
++ return caller;
+ }
+
+ ///> 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,
+- 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
+- }
+-
+- template
+- struct strip_ref
+- {
+- typedef T result;
+- };
+
+- template
+- struct strip_ref
+- {
+- typedef T result;
+- };
++ std::function m_func;
+
+- DELEGATE m_func;
++ bool m_running;
+
+ ///< pointer to coroutine entry arguments. Stripped of references
+ ///< to avoid compiler errors.
+- typename strip_ref::result* m_args;
++ typename std::remove_reference::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
Property changes on: head/cad/kicad/files/patch-include_tool_coroutine.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_tool_tool__base.h
===================================================================
--- head/cad/kicad/files/patch-include_tool_tool__base.h (nonexistent)
+++ head/cad/kicad/files/patch-include_tool_tool__base.h (revision 446084)
@@ -0,0 +1,22 @@
+--- include/tool/tool_base.h.orig 2017-07-14 19:17:29 UTC
++++ include/tool/tool_base.h
+@@ -31,7 +31,8 @@
+ #include
+ #include
+
+-#include
++// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad
++#include
+
+ class EDA_ITEM;
+ class TOOL_MANAGER;
+@@ -53,7 +54,8 @@ enum TOOL_TYPE
+
+ /// Unique identifier for tools
+ typedef int TOOL_ID;
+-typedef DELEGATE TOOL_STATE_FUNC;
++
++using TOOL_STATE_FUNC = std::function;
+
+ /**
+ * Class TOOL_BASE
Property changes on: head/cad/kicad/files/patch-include_tool_tool__base.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_tool_tool__interactive.h
===================================================================
--- head/cad/kicad/files/patch-include_tool_tool__interactive.h (nonexistent)
+++ head/cad/kicad/files/patch-include_tool_tool__interactive.h (revision 446084)
@@ -0,0 +1,20 @@
+--- include/tool/tool_interactive.h.orig 2017-07-14 19:17:29 UTC
++++ include/tool/tool_interactive.h
+@@ -26,6 +26,7 @@
+ #define __TOOL_INTERACTIVE_H
+
+ #include
++#include
+
+ #include
+ #include
+@@ -113,7 +114,8 @@ template
+ void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
+ const TOOL_EVENT_LIST& aConditions )
+ {
+- TOOL_STATE_FUNC sptr( static_cast( this ), aStateFunc );
++// Patch obtained from https://git.archlinux.org/svntogit/community.git/tree/trunk/boost-1.61.patch?h=packages/kicad
++ TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast( this ), std::placeholders::_1 );
+
+ goInternal( sptr, aConditions );
+ }
Property changes on: head/cad/kicad/files/patch-include_tool_tool__interactive.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/kicad/files/patch-include_tool_tool__manager.h
===================================================================
--- head/cad/kicad/files/patch-include_tool_tool__manager.h (nonexistent)
+++ head/cad/kicad/files/patch-include_tool_tool__manager.h (revision 446084)
@@ -0,0 +1,19 @@
+--- include/tool/tool_manager.h.orig 2017-07-14 19:17:29 UTC
++++ include/tool/tool_manager.h
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include