Date: Sat, 28 Mar 2026 12:43:52 +0000 From: Christoph Moench-Tegeder <cmt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7b58bf34c7f3 - main - cad/freecad: fix build with coin 4.0.8 Message-ID: <69c7cd08.43b81.2508bf24@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b58bf34c7f3468750f6c7111ae23a15336fbef3 commit 7b58bf34c7f3468750f6c7111ae23a15336fbef3 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> AuthorDate: 2026-03-28 12:42:57 +0000 Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> CommitDate: 2026-03-28 12:42:57 +0000 cad/freecad: fix build with coin 4.0.8 Patch taken from upstream. Bump for code change. --- cad/freecad/Makefile | 1 + cad/freecad/files/patch-compat-coin408 | 153 +++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+) diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index bb3b90350984..c78d05bd7378 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,5 +1,6 @@ PORTNAME= FreeCAD DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= cmt@FreeBSD.org diff --git a/cad/freecad/files/patch-compat-coin408 b/cad/freecad/files/patch-compat-coin408 new file mode 100644 index 000000000000..4c091d5e7bd5 --- /dev/null +++ b/cad/freecad/files/patch-compat-coin408 @@ -0,0 +1,153 @@ +commit dd3e6b65b537161abfb62188254d60dba5984f2c +Author: Captain <87000456+captain0xff@users.noreply.github.com> +Date: Sat Mar 21 05:52:51 2026 +0530 + + Gui: update CoinPtr to not use boost::intrusive_ptr (#28427) + +diff --git src/Gui/View3DInventor.cpp src/Gui/View3DInventor.cpp +index 807432fb68..037380390b 100644 +--- src/Gui/View3DInventor.cpp ++++ src/Gui/View3DInventor.cpp +@@ -597,7 +597,7 @@ bool View3DInventor::setCamera(const char* pCamera) + } + + // this is to make sure to reliably delete the node +- CoinPtr<SoNode> camPtr(Cam, true); ++ CoinPtr<SoNode> camPtr {Cam}; + + // toggle between perspective and orthographic camera + if (Cam->getTypeId() != CamViewer->getTypeId()) { +diff --git src/Gui/ViewProvider.h src/Gui/ViewProvider.h +index 2c4600cc80..7680d46f9f 100644 +--- src/Gui/ViewProvider.h ++++ src/Gui/ViewProvider.h +@@ -86,26 +86,102 @@ enum ViewStatus + }; + + ++/** Convenience smart pointer to manage the lifetime of coin nodes. ++ * ++ * This class is copied from Inventor/misc/SoRefPtr.h and can be removed when the ++ * minimum supported coin version provides this header. ++ */ ++template<typename T> ++class SoRefPtr ++{ ++public: ++ SoRefPtr(void) noexcept ++ : ptr(NULL) ++ {} ++ ++ explicit SoRefPtr(T* p) ++ : ptr(p) ++ { ++ if (this->ptr) { ++ this->ptr->ref(); ++ } ++ } ++ ++ SoRefPtr(const SoRefPtr& other) ++ : ptr(other.ptr) ++ { ++ if (this->ptr) { ++ this->ptr->ref(); ++ } ++ } ++ ++ SoRefPtr(SoRefPtr&& other) noexcept ++ : ptr(other.ptr) ++ { ++ other.ptr = NULL; ++ } ++ ++ ~SoRefPtr(void) ++ { ++ if (this->ptr) { ++ this->ptr->unref(); ++ } ++ } ++ ++ SoRefPtr& operator=(SoRefPtr other) noexcept ++ { ++ this->swap(other); ++ return *this; ++ } ++ ++ void reset(T* p = NULL) ++ { ++ SoRefPtr tmp(p); ++ this->swap(tmp); ++ } ++ ++ T* get(void) const noexcept ++ { ++ return this->ptr; ++ } ++ T& operator*(void) const ++ { ++ return *this->ptr; ++ } ++ T* operator->(void) const noexcept ++ { ++ return this->ptr; ++ } ++ explicit operator bool(void) const noexcept ++ { ++ return this->ptr != NULL; ++ } ++ ++ void swap(SoRefPtr& other) noexcept ++ { ++ using std::swap; ++ swap(this->ptr, other.ptr); ++ } ++ ++private: ++ T* ptr; ++}; ++ + /** Convenience smart pointer to wrap coin node. + * +- * It is basically boost::intrusive plus implicit pointer conversion to save the +- * trouble of typing get() all the time. ++ * This class isn't merged with SoRefPtr because it can be removed in the future + */ + template<class T> +-class CoinPtr: public boost::intrusive_ptr<T> ++class CoinPtr: public SoRefPtr<T> + { + public: +- // Too bad, VC2013 does not support constructor inheritance +- // using boost::intrusive_ptr<T>::intrusive_ptr; +- using inherited = boost::intrusive_ptr<T>; +- CoinPtr() = default; +- CoinPtr(T* p, bool add_ref = true) +- : inherited(p, add_ref) +- {} +- template<class Y> +- CoinPtr(CoinPtr<Y> const& r) +- : inherited(r) +- {} ++ using SoRefPtr<T>::SoRefPtr; ++ ++ CoinPtr& operator=(T* ptr) ++ { ++ SoRefPtr<T>::reset(ptr); ++ return *this; ++ } + + operator T*() const + { +diff --git src/Gui/ViewProviderLink.cpp src/Gui/ViewProviderLink.cpp +index 269c21dd9a..398e7ff921 100644 +--- src/Gui/ViewProviderLink.cpp ++++ src/Gui/ViewProviderLink.cpp +@@ -1644,7 +1644,7 @@ void LinkView::updateLink() + bool LinkView::linkGetElementPicked(const SoPickedPoint* pp, std::string& subname) const + { + std::ostringstream ss; +- CoinPtr<SoPath> path = pp->getPath(); ++ CoinPtr<SoPath> path {pp->getPath()}; + if (!nodeArray.empty()) { + auto idx = path->findNode(pcLinkRoot); + if (idx < 0 || idx + 2 >= path->getLength()) {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c7cd08.43b81.2508bf24>