On Sat, Oct 31, 2020 at 09:19:41PM -0400, Daniel Dickman wrote: > > > On Fri, 30 Oct 2020, Stuart Henderson wrote: > > > comms/sigrok/pulseview > > > > In file included from pulseview_autogen/mocs_compilation.cpp:6: > > In file included from pulseview_autogen/4KQHGSF5UX/moc_analogsegment.cpp:10: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/analogsegment.hpp:23: > > In file included from > > pulseview_autogen/4KQHGSF5UX/../../../pulseview-0.4.1/pv/data/segment.hpp:24: > > In file included from /pobj/pulseview-0.4.1/pulseview-0.4.1/pv/util.hpp:28: > > /usr/local/include/boost/multiprecision/cpp_dec_float.hpp:613:12: error: > > implicit instantiation of undefined template > > 'boost::serialization::nvp<bool>' > > > > > > How about this? Does someone want to check it works with the in-tree > version of boost as well? > > diff -Nur pulseview/Makefile pulseview.new/Makefile > --- pulseview/Makefile Fri Mar 8 15:00:40 2019 > +++ pulseview.new/Makefile Sat Oct 31 20:58:58 2020 > @@ -1,8 +1,7 @@ > # $OpenBSD: Makefile,v 1.4 2019/03/08 20:00:40 cwen Exp $ > > COMMENT = command-line frontend for sigrok logic analyzer > -REVISION = 1 > - > +REVISION = 2 > SIGROK_PROJECT = pulseview > SIGROK_VERSION = 0.4.1 > > diff -Nur pulseview/patches/patch-pv_util_hpp > pulseview.new/patches/patch-pv_util_hpp > --- pulseview/patches/patch-pv_util_hpp Wed Dec 31 19:00:00 1969 > +++ pulseview.new/patches/patch-pv_util_hpp Sat Oct 31 21:11:35 2020 > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +backport commit 136b891 to work around boost + clang10 issue > + > +Index: pv/util.hpp > +--- pv/util.hpp.orig > ++++ pv/util.hpp > +@@ -25,6 +25,7 @@ > + #include <vector> > + > + #ifndef Q_MOC_RUN > ++#include <boost/serialization/nvp.hpp> > + #include <boost/multiprecision/cpp_dec_float.hpp> > + #endif > +
I had sent the following diff from upstream to the MAINTAINER. The diff you have, from the git hash, is based on what I have. I built with both versions. Index: Makefile =================================================================== RCS file: /cvs/ports/comms/sigrok/pulseview/Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 Makefile --- Makefile 8 Mar 2019 20:00:40 -0000 1.4 +++ Makefile 30 Oct 2020 19:52:38 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2019/03/08 20:00:40 cwen Exp $ COMMENT = command-line frontend for sigrok logic analyzer -REVISION = 1 +REVISION = 2 SIGROK_PROJECT = pulseview SIGROK_VERSION = 0.4.1 Index: patches/patch-pv_util_hpp =================================================================== RCS file: patches/patch-pv_util_hpp diff -N patches/patch-pv_util_hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-pv_util_hpp 30 Oct 2020 19:52:38 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +pv/util.hpp: Workaround for a Boost::serialization / clang++-10 issue. + +Index: pv/util.hpp +--- pv/util.hpp.orig ++++ pv/util.hpp +@@ -25,6 +25,9 @@ + #include <vector> + + #ifndef Q_MOC_RUN ++// Workaround for https://github.com/boostorg/serialization/issues/186 ++#include <boost/serialization/nvp.hpp> ++ + #include <boost/multiprecision/cpp_dec_float.hpp> + #endif +
