svn commit: r483568 - in head/cad/freecad: . files
Jan Beich
jbeich at FreeBSD.org
Wed Oct 31 12:19:06 UTC 2018
Author: jbeich
Date: Wed Oct 31 12:19:05 2018
New Revision: 483568
URL: https://svnweb.freebsd.org/changeset/ports/483568
Log:
cad/freecad: unbreak with boost 1.69
CMake Error at /usr/local/share/cmake/Modules/FindBoost.cmake:2049 (message):
Unable to find the requested Boost libraries.
Boost version: 1.69.0
Boost include path: /usr/local/include
Could not find the following Boost libraries:
boost_signals
Some (but not all) of the required Boost libraries were found. You may
need to install these additional Boost libraries. Alternatively, set
BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT
to the location of Boost.
Call Stack (most recent call first):
CMakeLists.txt:596 (find_package)
PR: 232525
Obtained from: upstream (FreeCAD 0.18)
Added:
head/cad/freecad/files/patch-boost-1.69 (contents, props changed)
Modified:
head/cad/freecad/Makefile (contents, props changed)
Modified: head/cad/freecad/Makefile
==============================================================================
--- head/cad/freecad/Makefile Wed Oct 31 12:18:48 2018 (r483567)
+++ head/cad/freecad/Makefile Wed Oct 31 12:19:05 2018 (r483568)
@@ -2,7 +2,7 @@
PORTNAME= FreeCAD
DISTVERSION= 0.17.13509
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= cad
MAINTAINER= ports at FreeBSD.org
Added: head/cad/freecad/files/patch-boost-1.69
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cad/freecad/files/patch-boost-1.69 Wed Oct 31 12:19:05 2018 (r483568)
@@ -0,0 +1,1979 @@
+https://freecadweb.org/tracker/view.php?id=3653
+https://github.com/FreeCAD/FreeCAD/commit/f898eafd64f88902ea1916b01303705b3baa2c46
+
+--- CMakeLists.txt.orig 2018-04-06 08:48:37 UTC
++++ CMakeLists.txt
+@@ -594,7 +594,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ SET(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
+
+ find_package(Boost ${BOOST_MIN_VERSION}
+- COMPONENTS filesystem program_options regex signals system thread REQUIRED)
++ COMPONENTS filesystem program_options regex system thread REQUIRED)
+
+ IF(NOT Boost_FOUND)
+ MESSAGE(FATAL_ERROR "========================================\n"
+@@ -602,7 +602,6 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ " * filesystem\n"
+ " * program_options\n"
+ " * regex\n"
+- " * signals\n"
+ " * system\n"
+ " * thread\n"
+ "========================================\n")
+@@ -1074,7 +1073,7 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ IF(MSVC)
+ # set default compiler settings
+ SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHa")
+- SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm128")
++ SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm128 /bigobj")
+ # set default libs
+ SET (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ")
+ set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
+--- src/App/Application.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/App/Application.cpp
+@@ -120,7 +120,6 @@
+
+ #include <boost/tokenizer.hpp>
+ #include <boost/token_functions.hpp>
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/version.hpp>
+ #include <QDir>
+--- src/App/Application.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/Application.h
+@@ -25,7 +25,7 @@
+ #ifndef APP_APPLICATION_H
+ #define APP_APPLICATION_H
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include <vector>
+
+@@ -99,27 +99,27 @@ class AppExport Application (public)
+ /** @name Signals of the Application */
+ //@{
+ /// signal on new Document
+- boost::signal<void (const Document&)> signalNewDocument;
++ boost::signals2::signal<void (const Document&)> signalNewDocument;
+ /// signal on document getting deleted
+- boost::signal<void (const Document&)> signalDeleteDocument;
++ boost::signals2::signal<void (const Document&)> signalDeleteDocument;
+ /// signal on already deleted Document
+- boost::signal<void ()> signalDeletedDocument;
++ boost::signals2::signal<void ()> signalDeletedDocument;
+ /// signal on relabeling Document (user name)
+- boost::signal<void (const Document&)> signalRelabelDocument;
++ boost::signals2::signal<void (const Document&)> signalRelabelDocument;
+ /// signal on renaming Document (internal name)
+- boost::signal<void (const Document&)> signalRenameDocument;
++ boost::signals2::signal<void (const Document&)> signalRenameDocument;
+ /// signal on activating Document
+- boost::signal<void (const Document&)> signalActiveDocument;
++ boost::signals2::signal<void (const Document&)> signalActiveDocument;
+ /// signal on saving Document
+- boost::signal<void (const Document&)> signalSaveDocument;
++ boost::signals2::signal<void (const Document&)> signalSaveDocument;
+ /// signal on starting to restore Document
+- boost::signal<void (const Document&)> signalStartRestoreDocument;
++ boost::signals2::signal<void (const Document&)> signalStartRestoreDocument;
+ /// signal on restoring Document
+- boost::signal<void (const Document&)> signalFinishRestoreDocument;
++ boost::signals2::signal<void (const Document&)> signalFinishRestoreDocument;
+ /// signal on undo in document
+- boost::signal<void (const Document&)> signalUndoDocument;
++ boost::signals2::signal<void (const Document&)> signalUndoDocument;
+ /// signal on redo in document
+- boost::signal<void (const Document&)> signalRedoDocument;
++ boost::signals2::signal<void (const Document&)> signalRedoDocument;
+ //@}
+
+
+@@ -129,16 +129,16 @@ class AppExport Application (public)
+ */
+ //@{
+ /// signal on new Object
+- boost::signal<void (const App::DocumentObject&)> signalNewObject;
+- //boost::signal<void (const App::DocumentObject&)> m_sig;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
++ //boost::signals2::signal<void (const App::DocumentObject&)> m_sig;
+ /// signal on deleted Object
+- boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
+ /// signal on changed Object
+- boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
++ boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
+ /// signal on relabeled Object
+- boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
+ /// signal on activated Object
+- boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
+ //@}
+
+ /** @name Signals of property changes
+@@ -147,11 +147,11 @@ class AppExport Application (public)
+ */
+ //@{
+ /// signal on adding a dynamic property
+- boost::signal<void (const App::Property&)> signalAppendDynamicProperty;
++ boost::signals2::signal<void (const App::Property&)> signalAppendDynamicProperty;
+ /// signal on about removing a dynamic property
+- boost::signal<void (const App::Property&)> signalRemoveDynamicProperty;
++ boost::signals2::signal<void (const App::Property&)> signalRemoveDynamicProperty;
+ /// signal on about changing the editor mode of a property
+- boost::signal<void (const App::Property&)> signalChangePropertyEditor;
++ boost::signals2::signal<void (const App::Property&)> signalChangePropertyEditor;
+ //@}
+
+
+--- src/App/Document.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/Document.h
+@@ -37,7 +37,7 @@
+ #include <stack>
+ #include <functional>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ namespace Base {
+ class Writer;
+@@ -113,40 +113,40 @@ class AppExport Document : public App::PropertyContain
+ /** @name Signals of the document */
+ //@{
+ /// signal on new Object
+- boost::signal<void (const App::DocumentObject&)> signalNewObject;
+- //boost::signal<void (const App::DocumentObject&)> m_sig;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
++ //boost::signals2::signal<void (const App::DocumentObject&)> m_sig;
+ /// signal on deleted Object
+- boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
+ /// signal on changed Object
+- boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
++ boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
+ /// signal on relabeled Object
+- boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
+ /// signal on activated Object
+- boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
++ boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
+ /// signal on created object
+- boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
++ boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
+ /// signal on removed object
+- boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
++ boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
+ /// signal on undo
+- boost::signal<void (const App::Document&)> signalUndo;
++ boost::signals2::signal<void (const App::Document&)> signalUndo;
+ /// signal on redo
+- boost::signal<void (const App::Document&)> signalRedo;
++ boost::signals2::signal<void (const App::Document&)> signalRedo;
+ /** signal on load/save document
+ * this signal is given when the document gets streamed.
+ * you can use this hook to write additional information in
+ * the file (like the Gui::Document it does).
+ */
+- boost::signal<void (Base::Writer &)> signalSaveDocument;
+- boost::signal<void (Base::XMLReader&)> signalRestoreDocument;
+- boost::signal<void (const std::vector<App::DocumentObject*>&,
++ boost::signals2::signal<void (Base::Writer &)> signalSaveDocument;
++ boost::signals2::signal<void (Base::XMLReader&)> signalRestoreDocument;
++ boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+ Base::Writer &)> signalExportObjects;
+- boost::signal<void (const std::vector<App::DocumentObject*>&,
++ boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+ Base::Writer &)> signalExportViewObjects;
+- boost::signal<void (const std::vector<App::DocumentObject*>&,
++ boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+ Base::XMLReader&)> signalImportObjects;
+- boost::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
++ boost::signals2::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
+ const std::map<std::string, std::string>&)> signalImportViewObjects;
+- boost::signal<void (const App::Document&)> signalRecomputed;
++ boost::signals2::signal<void (const App::Document&)> signalRecomputed;
+ //@}
+
+ /** @name File handling of the document */
+--- src/App/DocumentObject.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/App/DocumentObject.cpp
+@@ -38,7 +38,7 @@
+ #include "DocumentObjectExtension.h"
+ #include "GeoFeatureGroupExtension.h"
+ #include <App/DocumentObjectPy.h>
+-#include <boost/signals/connection.hpp>
++#include <boost/signals2/connection.hpp>
+ #include <boost/bind.hpp>
+
+ using namespace App;
+--- src/App/DocumentObject.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/DocumentObject.h
+@@ -33,7 +33,7 @@
+ #include <CXX/Objects.hxx>
+
+ #include <bitset>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ namespace App
+ {
+@@ -282,9 +282,9 @@ class AppExport DocumentObject: public App::Transactio
+ App::Document* _pDoc;
+
+ // Connections to track relabeling of document and document objects
+- boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection;
+- boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledObjectConnection;
+- boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onDeletedObjectConnection;
++ boost::signals2::scoped_connection onRelabledDocumentConnection;
++ boost::signals2::scoped_connection onRelabledObjectConnection;
++ boost::signals2::scoped_connection onDeletedObjectConnection;
+
+ /// Old label; used for renaming expressions
+ std::string oldLabel;
+--- src/App/DocumentObserver.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/App/DocumentObserver.cpp
+@@ -27,7 +27,6 @@
+ # include <sstream>
+ #endif
+
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+
+ #include "Application.h"
+--- src/App/DocumentObserver.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/DocumentObserver.h
+@@ -25,7 +25,7 @@
+ #define APP_DOCUMENTOBSERVER_H
+
+ #include <Base/BaseClass.h>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <set>
+
+ namespace App
+@@ -157,7 +157,7 @@ class AppExport DocumentObserver (protected)
+
+ private:
+ App::Document* _document;
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectApplicationCreatedDocument;
+ Connection connectApplicationDeletedDocument;
+ Connection connectDocumentCreatedObject;
+--- src/App/DocumentObserverPython.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/DocumentObserverPython.h
+@@ -26,7 +26,7 @@
+
+ #include <CXX/Objects.hxx>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ namespace App
+@@ -74,7 +74,7 @@ class AppExport DocumentObserverPython (private)
+ Py::Object inst;
+ static std::vector<DocumentObserverPython*> _instances;
+
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectApplicationCreatedDocument;
+ Connection connectApplicationDeletedDocument;
+ Connection connectApplicationRelabelDocument;
+--- src/App/MergeDocuments.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/MergeDocuments.h
+@@ -24,7 +24,7 @@
+ #ifndef APP_MERGEDOCUMENTS_H
+ #define APP_MERGEDOCUMENTS_H
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <Base/Persistence.h>
+
+ namespace zipios {
+@@ -57,7 +57,7 @@ class AppExport MergeDocuments : public Base::Persiste
+ App::Document* appdoc;
+ std::vector<App::DocumentObject*> objects;
+ std::map<std::string, std::string> nameMap;
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectExport;
+ Connection connectImport;
+ };
+--- src/App/PreCompiled.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/PreCompiled.h
+@@ -71,7 +71,7 @@
+ #include <random>
+
+ // Boost
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/regex.hpp>
+
+--- src/App/PropertyExpressionEngine.h.orig 2018-04-06 08:48:37 UTC
++++ src/App/PropertyExpressionEngine.h
+@@ -25,7 +25,7 @@
+
+ #include <boost/unordered/unordered_map.hpp>
+ #include <boost/function.hpp>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/topological_sort.hpp>
+ #include <App/Property.h>
+@@ -125,7 +125,7 @@ class AppExport PropertyExpressionEngine : public App:
+ void slotObjectDeleted(const DocumentObject &obj);
+
+ ///signal called when a expression was changed
+- boost::signal<void (const App::ObjectIdentifier &)> expressionChanged;
++ boost::signals2::signal<void (const App::ObjectIdentifier &)> expressionChanged;
+
+ void onDocumentRestored();
+
+--- src/Base/Tools.h.orig 2018-04-06 08:48:37 UTC
++++ src/Base/Tools.h
+@@ -30,7 +30,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <QString>
+
+ namespace Base
+@@ -166,17 +166,14 @@ class ObjectStatusLocker (private)
+ // ----------------------------------------------------------------------------
+
+ class ConnectionBlocker {
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
+- bool b;
+- Connection& c;
++ typedef boost::signals2::connection Connection;
++ typedef boost::signals2::shared_connection_block ConnectionBlock;
++ ConnectionBlock blocker;
+
+ public:
+- ConnectionBlocker(Connection& c) : c(c) {
+- b = c.blocked();
+- c.block(true);
++ ConnectionBlocker(Connection& c) : blocker(c) {
+ }
+ ~ConnectionBlocker() {
+- c.block(b);
+ }
+ };
+
+--- src/Gui/Action.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Action.cpp
+@@ -24,7 +24,7 @@
+ #include "PreCompiled.h"
+
+ #ifndef _PreComp_
+-# include <boost/signals.hpp>
++# include <boost/signals2.hpp>
+ # include <boost/bind.hpp>
+ # include <QAbstractItemView>
+ # include <QActionEvent>
+--- src/Gui/Application.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Application.cpp
+@@ -25,7 +25,7 @@
+
+ #ifndef _PreComp_
+ # include "InventorAll.h"
+-# include <boost/signals.hpp>
++# include <boost/signals2.hpp>
+ # include <boost/bind.hpp>
+ # include <sstream>
+ # include <stdexcept>
+--- src/Gui/Application.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Application.h
+@@ -88,33 +88,33 @@ class GuiExport Application (public)
+ /** @name Signals of the Application */
+ //@{
+ /// signal on new Document
+- boost::signal<void (const Gui::Document&)> signalNewDocument;
++ boost::signals2::signal<void (const Gui::Document&)> signalNewDocument;
+ /// signal on deleted Document
+- boost::signal<void (const Gui::Document&)> signalDeleteDocument;
++ boost::signals2::signal<void (const Gui::Document&)> signalDeleteDocument;
+ /// signal on relabeling Document
+- boost::signal<void (const Gui::Document&)> signalRelabelDocument;
++ boost::signals2::signal<void (const Gui::Document&)> signalRelabelDocument;
+ /// signal on renaming Document
+- boost::signal<void (const Gui::Document&)> signalRenameDocument;
++ boost::signals2::signal<void (const Gui::Document&)> signalRenameDocument;
+ /// signal on activating Document
+- boost::signal<void (const Gui::Document&)> signalActiveDocument;
++ boost::signals2::signal<void (const Gui::Document&)> signalActiveDocument;
+ /// signal on new Object
+- boost::signal<void (const Gui::ViewProvider&)> signalNewObject;
++ boost::signals2::signal<void (const Gui::ViewProvider&)> signalNewObject;
+ /// signal on deleted Object
+- boost::signal<void (const Gui::ViewProvider&)> signalDeletedObject;
++ boost::signals2::signal<void (const Gui::ViewProvider&)> signalDeletedObject;
+ /// signal on changed object property
+- boost::signal<void (const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
++ boost::signals2::signal<void (const Gui::ViewProvider&, const App::Property&)> signalChangedObject;
+ /// signal on renamed Object
+- boost::signal<void (const Gui::ViewProvider&)> signalRelabelObject;
++ boost::signals2::signal<void (const Gui::ViewProvider&)> signalRelabelObject;
+ /// signal on activated Object
+- boost::signal<void (const Gui::ViewProvider&)> signalActivatedObject;
++ boost::signals2::signal<void (const Gui::ViewProvider&)> signalActivatedObject;
+ /// signal on activated workbench
+- boost::signal<void (const char*)> signalActivateWorkbench;
++ boost::signals2::signal<void (const char*)> signalActivateWorkbench;
+ /// signal on added workbench
+- boost::signal<void (const char*)> signalAddWorkbench;
++ boost::signals2::signal<void (const char*)> signalAddWorkbench;
+ /// signal on removed workbench
+- boost::signal<void (const char*)> signalRemoveWorkbench;
++ boost::signals2::signal<void (const char*)> signalRemoveWorkbench;
+ /// signal on activating view
+- boost::signal<void (const Gui::MDIView*)> signalActivateView;
++ boost::signals2::signal<void (const Gui::MDIView*)> signalActivateView;
+ //@}
+
+ /** @name methods for Document handling */
+--- src/Gui/AutoSaver.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/AutoSaver.h
+@@ -29,7 +29,7 @@
+ #include <map>
+ #include <set>
+ #include <string>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ namespace App {
+ class Document;
+@@ -53,7 +53,7 @@ class AutoSaveProperty (public)
+ private:
+ void slotNewObject(const App::DocumentObject&);
+ void slotChangePropertyData(const App::Property&);
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection documentNew;
+ Connection documentMod;
+ };
+--- src/Gui/DAGView/DAGModel.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DAGView/DAGModel.cpp
+@@ -22,7 +22,6 @@
+
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/graph/topological_sort.hpp>
+ #include <boost/graph/reverse_graph.hpp>
+--- src/Gui/DAGView/DAGModel.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DAGView/DAGModel.h
+@@ -26,7 +26,7 @@
+ #include <memory>
+ #include <vector>
+
+-#include <boost/signal.hpp>
++#include <boost/signals2.hpp>
+
+ #include <QGraphicsScene>
+ #include <QBrush>
+@@ -86,7 +86,7 @@ namespace Gui
+ private:
+ Model(){}
+ //documentObject slots.
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectNewObject;
+ Connection connectDelObject;
+ Connection connectChgObject;
+--- src/Gui/DlgDisplayPropertiesImp.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DlgDisplayPropertiesImp.h
+@@ -25,7 +25,7 @@
+ #define GUI_DIALOG_DLGDISPLAYPROPERTIES_IMP_H
+
+ #include <vector>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ #include "ui_DlgDisplayProperties.h"
+ #include "Selection.h"
+@@ -42,7 +42,7 @@ namespace Gui {
+ class Command;
+
+ namespace Dialog {
+-typedef boost::signals::connection DlgDisplayPropertiesImp_Connection;
++typedef boost::signals2::connection DlgDisplayPropertiesImp_Connection;
+
+ /**
+ * The DlgDisplayPropertiesImp class implements a dialog containing all available document
+@@ -79,7 +79,7 @@ private Q_SLOTS: (protected)
+
+ private:
+ void slotChangedObject(const Gui::ViewProvider&, const App::Property& Prop);
+- void reject();
++ void reject();
+ void setDisplayModes(const std::vector<ViewProvider*>&);
+ void setMaterial(const std::vector<ViewProvider*>&);
+ void setColorPlot(const std::vector<ViewProvider*>&);
+--- src/Gui/Document.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Document.cpp
+@@ -31,7 +31,7 @@
+ # include <QKeySequence>
+ # include <qmessagebox.h>
+ # include <qstatusbar.h>
+-# include <boost/signals.hpp>
++# include <boost/signals2.hpp>
+ # include <boost/bind.hpp>
+ # include <Inventor/actions/SoSearchAction.h>
+ # include <Inventor/nodes/SoSeparator.h>
+@@ -89,7 +89,7 @@ struct DocumentP
+ std::map<const App::DocumentObject*,ViewProviderDocumentObject*> _ViewProviderMap;
+ std::map<std::string,ViewProvider*> _ViewProviderMapAnnotation;
+
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectNewObject;
+ Connection connectDelObject;
+ Connection connectCngObject;
+@@ -105,6 +105,8 @@ struct DocumentP
+ Connection connectRedoDocument;
+ Connection connectTransactionAppend;
+ Connection connectTransactionRemove;
++ typedef boost::signals2::shared_connection_block ConnectionBlock;
++ ConnectionBlock connectActObjectBlocker;
+ };
+
+ } // namespace Gui
+@@ -138,6 +140,8 @@ Document::Document(App::Document* pcDocument,Applicati
+ (boost::bind(&Gui::Document::slotRelabelObject, this, _1));
+ d->connectActObject = pcDocument->signalActivatedObject.connect
+ (boost::bind(&Gui::Document::slotActivatedObject, this, _1));
++ d->connectActObjectBlocker = boost::signals2::shared_connection_block
++ (d->connectActObject, false);
+ d->connectSaveDocument = pcDocument->signalSaveDocument.connect
+ (boost::bind(&Gui::Document::Save, this, _1));
+ d->connectRestDocument = pcDocument->signalRestoreDocument.connect
+@@ -846,14 +850,14 @@ void Document::slotStartRestoreDocument(const App::Doc
+ if (d->_pcDocument != &doc)
+ return;
+ // disable this signal while loading a document
+- d->connectActObject.block();
++ d->connectActObjectBlocker.block();
+ }
+
+ void Document::slotFinishRestoreDocument(const App::Document& doc)
+ {
+ if (d->_pcDocument != &doc)
+ return;
+- d->connectActObject.unblock();
++ d->connectActObjectBlocker.unblock();
+ App::DocumentObject* act = doc.getActiveObject();
+ if (act) {
+ ViewProvider* viewProvider = getViewProvider(act);
+--- src/Gui/Document.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Document.h
+@@ -92,36 +92,36 @@ class GuiExport Document : public Base::Persistence (
+ /** @name Signals of the document */
+ //@{
+ /// signal on new Object
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalNewObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalNewObject;
+ /// signal on deleted Object
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalDeletedObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalDeletedObject;
+ /** signal on changed Object, the 2nd argument is the changed property
+ of the referenced document object, not of the view provider */
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
+ const App::Property&)> signalChangedObject;
+ /// signal on renamed Object
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalRelabelObject;
+ /// signal on activated Object
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalActivatedObject;
+ /// signal on entering in edit mode
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalInEdit;
+ /// signal on leaving edit mode
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalResetEdit;
+ /// signal on changed Object, the 2nd argument is the highlite mode to use
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
+- const Gui::HighlightMode&,
+- bool)> signalHighlightObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
++ const Gui::HighlightMode&,
++ bool)> signalHighlightObject;
+ /// signal on changed Object, the 2nd argument is the highlite mode to use
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&,
+- const Gui::TreeItemMode&)> signalExpandObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&,
++ const Gui::TreeItemMode&)> signalExpandObject;
+ /// signal on scrolling to an object
+- mutable boost::signal<void (const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
++ mutable boost::signals2::signal<void (const Gui::ViewProviderDocumentObject&)> signalScrollToObject;
+ /// signal on undo Document
+- mutable boost::signal<void (const Gui::Document& doc)> signalUndoDocument;
++ mutable boost::signals2::signal<void (const Gui::Document& doc)> signalUndoDocument;
+ /// signal on redo Document
+- mutable boost::signal<void (const Gui::Document& doc)> signalRedoDocument;
++ mutable boost::signals2::signal<void (const Gui::Document& doc)> signalRedoDocument;
+ /// signal on deleting Document
+- mutable boost::signal<void (const Gui::Document& doc)> signalDeleteDocument;
++ mutable boost::signals2::signal<void (const Gui::Document& doc)> signalDeleteDocument;
+ //@}
+
+ /** @name I/O of the document */
+--- src/Gui/DocumentModel.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DocumentModel.cpp
+@@ -26,7 +26,7 @@
+ #ifndef _PreComp_
+ # include <QApplication>
+ # include <algorithm>
+-# include <boost/signals.hpp>
++# include <boost/signals2.hpp>
+ # include <boost/bind.hpp>
+ #endif
+
+--- src/Gui/DocumentObserver.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DocumentObserver.cpp
+@@ -27,7 +27,6 @@
+ # include <sstream>
+ #endif
+
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+
+ #include "Application.h"
+@@ -87,19 +86,6 @@ void DocumentObserver::detachDocument()
+ this->connectDocumentUndo.disconnect();
+ this->connectDocumentRedo.disconnect();
+ this->connectDocumentDelete.disconnect();
+-}
+-
+-void DocumentObserver::enableNotifications(DocumentObserver::Notifications value)
+-{
+- this->connectDocumentCreatedObject.block(!(value & Create));
+- this->connectDocumentDeletedObject.block(!(value & Delete));
+- this->connectDocumentChangedObject.block(!(value & Change));
+- this->connectDocumentRelabelObject.block(!(value & Relabel));
+- this->connectDocumentActivateObject.block(!(value & Activate));
+- this->connectDocumentEditObject.block(!(value & Edit));
+- this->connectDocumentResetObject.block(!(value & Reset));
+- this->connectDocumentUndo.block(!(value & Undo));
+- this->connectDocumentRedo.block(!(value & Redo));
+ }
+
+ void DocumentObserver::slotUndoDocument(const Document& /*Doc*/)
+--- src/Gui/DocumentObserver.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/DocumentObserver.h
+@@ -25,8 +25,7 @@
+ #define GUI_DOCUMENTOBSERVER_H
+
+ #include <Base/BaseClass.h>
+-#include <boost/signals.hpp>
+-#include <QFlags>
++#include <boost/signals2.hpp>
+
+ namespace App { class Property; }
+ namespace Gui
+@@ -45,21 +44,6 @@ class ViewProviderDocumentObject;
+ class GuiExport DocumentObserver
+ {
+ public:
+- enum Notification {
+- None = 0x0000,
+- Create = 0x0001,
+- Delete = 0x0002,
+- Change = 0x0004,
+- Relabel = 0x0008,
+- Activate = 0x0010,
+- Edit = 0x0020,
+- Reset = 0x0040,
+- Undo = 0x0080,
+- Redo = 0x0100,
+- All = 0x01ff
+- };
+- Q_DECLARE_FLAGS(Notifications, Notification)
+-
+ /// Constructor
+ DocumentObserver();
+ virtual ~DocumentObserver();
+@@ -72,9 +56,6 @@ class GuiExport DocumentObserver (public)
+ * is not longer observed then.
+ */
+ void detachDocument();
+- /** Activates the connection depending on the given value.
+- */
+- void enableNotifications(Notifications value);
+
+ private:
+ /** Notifies when an object has been created. */
+@@ -100,7 +81,7 @@ class GuiExport DocumentObserver (public)
+ virtual void slotDeleteDocument(const Document& Doc);
+
+ private:
+- typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection;
++ typedef boost::signals2::scoped_connection Connection;
+ Connection connectDocumentCreatedObject;
+ Connection connectDocumentDeletedObject;
+ Connection connectDocumentChangedObject;
+--- src/Gui/ExpressionBinding.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/ExpressionBinding.h
+@@ -27,7 +27,7 @@
+ #include <App/ObjectIdentifier.h>
+ #include <boost/shared_ptr.hpp>
+ #include <QLabel>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ namespace App {
+ class Expression;
+@@ -75,7 +75,7 @@ class GuiExport ExpressionBinding (protected)
+ int iconHeight;
+
+ void expressionChange(const App::ObjectIdentifier& id);
+- boost::signals::scoped_connection connection;
++ boost::signals2::scoped_connection connection;
+ bool m_autoApply;
+ };
+
+--- src/Gui/GraphvizView.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/GraphvizView.h
+@@ -26,7 +26,7 @@
+
+ #include "MDIView.h"
+ #include <boost/shared_ptr.hpp>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+
+ class QGraphicsScene;
+@@ -84,7 +84,7 @@ private Q_SLOTS: (private)
+ GraphvizWorker* thread;
+ int nPending;
+
+- typedef boost::BOOST_SIGNALS_NAMESPACE::scoped_connection Connection;
++ typedef boost::signals2::scoped_connection Connection;
+ Connection recomputeConnection;
+ Connection undoConnection;
+ Connection redoConnection;
+--- src/Gui/MDIView.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/MDIView.cpp
+@@ -24,7 +24,7 @@
+ #include "PreCompiled.h"
+
+ #ifndef _PreComp_
+-# include <boost/signals.hpp>
++# include <boost/signals2.hpp>
+ # include <boost/bind.hpp>
+ # include <qapplication.h>
+ # include <qregexp.h>
+--- src/Gui/MDIView.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/MDIView.h
+@@ -150,7 +150,7 @@ protected Q_SLOTS: (private)
+ Qt::WindowStates wstate;
+ // list of active objects of this view
+ ActiveObjectList ActiveObjects;
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectDelObject; //remove active object upon delete.
+ };
+
+--- src/Gui/MainWindow.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/MainWindow.cpp
+@@ -51,7 +51,6 @@
+ # include <QWhatsThis>
+ #endif
+
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+
+ // FreeCAD Base header
+--- src/Gui/ManualAlignment.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/ManualAlignment.cpp
+@@ -49,7 +49,6 @@
+ # include <Inventor/sensors/SoNodeSensor.h>
+ #endif
+
+-#include <boost/signals.hpp>
+ #include <boost/bind.hpp>
+
+ #include <App/Document.h>
+--- src/Gui/ManualAlignment.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/ManualAlignment.h
+@@ -30,7 +30,7 @@
+ #include <Gui/Application.h>
+ #include <Gui/Document.h>
+ #include <Gui/ViewProviderDocumentObject.h>
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ class SbVec3f;
+ class SoPickedPoint;
+@@ -244,7 +244,7 @@ Q_SIGNALS: (private)
+
+ static ManualAlignment* _instance;
+
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectApplicationDeletedDocument;
+ Connection connectDocumentDeletedObject;
+
+--- src/Gui/MergeDocuments.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/MergeDocuments.h
+@@ -24,7 +24,7 @@
+ #ifndef GUI_MERGEDOCUMENTS_H
+ #define GUI_MERGEDOCUMENTS_H
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <Base/Persistence.h>
+
+ namespace zipios {
+@@ -57,7 +57,7 @@ class GuiExport MergeDocuments : public Base::Persiste
+ Gui::Document* document;
+ std::vector<App::DocumentObject*> objects;
+ std::map<std::string, std::string> nameMap;
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectExport;
+ Connection connectImport;
+ };
+--- src/Gui/Placement.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Placement.h
+@@ -28,7 +28,7 @@
+ #include <Gui/TaskView/TaskView.h>
+ #include <Base/Placement.h>
+
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+
+ class QSignalMapper;
+@@ -84,7 +84,7 @@ Q_SIGNALS:
+
+ private:
+ typedef Gui::LocationInterfaceComp<Ui_Placement> Ui_PlacementComp;
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Ui_PlacementComp* ui;
+ QSignalMapper* signalMapper;
+ Connection connectAct;
+--- src/Gui/PreCompiled.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/PreCompiled.h
+@@ -72,7 +72,7 @@
+ #include <bitset>
+
+ // Boost
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/tuple/tuple.hpp>
+--- src/Gui/ProjectView.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/ProjectView.cpp
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+
+ #ifndef _PreComp_
+-# include <boost/signals.hpp>
+ # include <boost/bind.hpp>
+ # include <QAction>
+ # include <QActionGroup>
+--- src/Gui/PropertyView.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/PropertyView.h
+@@ -28,7 +28,7 @@
+
+ #include "DockWindow.h"
+ #include "Selection.h"
+-#include <boost/signals.hpp>
++#include <boost/signals2.hpp>
+
+ class QPixmap;
+ class QTabWidget;
+@@ -65,15 +65,15 @@ class PropertyView : public QWidget, public Gui::Selec
+ Gui::PropertyEditor::PropertyEditor* propertyEditorView;
+ Gui::PropertyEditor::PropertyEditor* propertyEditorData;
+
+-public Q_SLOTS:
+- /// Stores a preference for the last tab selected
+- void tabChanged(int index);
+-
++public Q_SLOTS:
++ /// Stores a preference for the last tab selected
++ void tabChanged(int index);
++
+ protected:
+ void changeEvent(QEvent *e);
+
+ private:
+- void onSelectionChanged(const SelectionChanges& msg);
++ void onSelectionChanged(const SelectionChanges& msg);
+ void slotChangePropertyData(const App::DocumentObject&, const App::Property&);
+ void slotChangePropertyView(const Gui::ViewProvider&, const App::Property&);
+ void slotAppendDynamicProperty(const App::Property&);
+@@ -83,7 +83,7 @@ public Q_SLOTS: (private)
+ private:
+ struct PropInfo;
+ struct PropFind;
+- typedef boost::BOOST_SIGNALS_NAMESPACE::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectPropData;
+ Connection connectPropView;
+ Connection connectPropAppend;
+--- src/Gui/Selection.cpp.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Selection.cpp
+@@ -26,7 +26,6 @@
+ #ifndef _PreComp_
+ # include <assert.h>
+ # include <string>
+-# include <boost/signals.hpp>
+ # include <boost/bind.hpp>
+ # include <QApplication>
+ # include <QString>
+@@ -54,7 +53,7 @@
+ using namespace Gui;
+ using namespace std;
+
+-SelectionObserver::SelectionObserver()
++SelectionObserver::SelectionObserver() : blocker(connectSelection, false)
+ {
+ attachSelection();
+ }
+@@ -68,9 +67,9 @@ bool SelectionObserver::blockConnection(bool block)
+ {
+ bool ok = connectSelection.blocked();
+ if (block)
+- connectSelection.block();
++ blocker.block();
+ else
+- connectSelection.unblock();
++ blocker.unblock();
+ return ok;
+ }
+
+--- src/Gui/Selection.h.orig 2018-04-06 08:48:37 UTC
++++ src/Gui/Selection.h
+@@ -30,6 +30,7 @@
+ #include <vector>
+ #include <list>
+ #include <map>
++#include <boost/signals2.hpp>
+ #include <CXX/Objects.hxx>
+
+ #include <Base/Observer.h>
+@@ -143,8 +144,9 @@ class GuiExport SelectionObserver (private)
+ virtual void onSelectionChanged(const SelectionChanges& msg) = 0;
+
+ private:
+- typedef boost::signals::connection Connection;
++ typedef boost::signals2::connection Connection;
+ Connection connectSelection;
++ boost::signals2::shared_connection_block blocker;
+ };
+
+ /**
+@@ -290,7 +292,7 @@ class GuiExport SelectionSingleton : public Base::Subj
+ };
+
+ /// signal on new object
+- boost::signal<void (const SelectionChanges& msg)> signalSelectionChanged;
++ boost::signals2::signal<void (const SelectionChanges& msg)> signalSelectionChanged;
+
+ /** Returns a vector of selection objects
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list