> > > > > > update/followup commits:
> > > > > > /usr/local/include/boost/type_traits/detail/has_binary_operator.hp:50:
> > > > > > Parse error at "BOOST_JOIN"
> >
> > attached is a fix for cad/openscad. i could not fix the compile failures
> > using the workarounds mentioned in previous email. will take a look at
> > games/pokerth tomorrow. i swear i packaged it successfully otherwise how
> > could i get a PLIST? puzzled as to what changed in the interim.
> >
> > thanks
> >
> > The Makefile has a dummy line feed to force it to show the port where this
> > patch should apply.
>
> No, I don't want to go down this route. I'm still building Qt4 but I want to
> patch Moc as that is where the issue is. Moc in Qt5 has already been fixed
> of its deficiency. That just leaves monotone left and someone had posted an
> update. You need something newer than 1.0 though.
Attached is a patch for qt4, which fixes cad/openscad and games/pokerth. It
fixes the compile errors, it also lists where the bugfix is lifted from. I
cleaned everything and then built qt4 with the patch. Obviously this needs to
go in a bulk before its committed.
The second line BOOST_LEXICAL_CAST_INCLUDED is also needed, at least when I
tested it on amd64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile 11 Mar 2013 11:46:15 -0000 1.109
+++ Makefile 14 Mar 2013 17:52:45 -0000
@@ -24,7 +24,7 @@ PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main= 5
+REVISION-main= 6
REVISION-mysql= 0
REVISION-postgresql= 0
REVISION-examples= 0
Index: patches/patch-src_tools_moc_main_cpp
===================================================================
RCS file: patches/patch-src_tools_moc_main_cpp
diff -N patches/patch-src_tools_moc_main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tools_moc_main_cpp 14 Mar 2013 17:52:45 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix for the BOOST_JOIN parse error in games/pokerth & cad/openscad + other
places...
+
+--- src/tools/moc/main.cpp.orig Wed Mar 13 11:20:37 2013
++++ src/tools/moc/main.cpp Wed Mar 13 11:22:12 2013
+@@ -187,6 +187,12 @@ int runMoc(int _argc, char **_argv)
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++
++ //
http://pkgs.fedoraproject.org/cgit/qt.git/commit/?id=22f92f680b88a10f179eaa121b367446a6c80f7a
++
++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;
