svn commit: r411765 - in head: audio/clementine-player/files cad/openscad/files devel/qt4-moc/files graphics/aqsis/files graphics/evolvotron/files multimedia/gstreamer-qt4/files net-p2p/namecoin/fi...

[Raphael Kubo da Costa]

Author: rakuco
Date: Thu Mar 24 10:31:07 2016
New Revision: 411765
URL: https://svnweb.freebsd.org/changeset/ports/411765

Log:
  qt4-moc: Add more Boost include guards to moc's definition list.
  
  In preparation for updating Boost to 1.60, add include guards from more Boost
  headers to the list of macros that moc automatically defines when processing
  files. As explained in r408911, Qt4's moc cannot parse some constructs used by
  a few Boost headers, so we define their include guards to make moc skip them.
  
  This is a cleaner approach that allows us to largely revert r408472, r408473,
  r408474, r408475, r408502, r408773 and r408419, which added several patches to
  many ports to work around this moc bug.
  
  PR:		199601
  PR:		208322

Deleted:
  head/audio/clementine-player/files/patch-src_core_mergedproxymodel.h
  head/audio/clementine-player/files/patch-src_library_groupbydialog.h
  head/cad/openscad/files/
  head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h
  head/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h
  head/graphics/aqsis/files/patch-include_aqsis_util_socket.h
  head/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp
  head/graphics/aqsis/files/patch-tools_piqsl_image.h
  head/graphics/evolvotron/files/patch-libfunction_useful.h
  head/multimedia/gstreamer-qt4/files/
  head/net-p2p/namecoin/files/patch-src_allocators.h
  head/net-p2p/namecoin/files/patch-src_qt_guiutil.h
  head/net-p2p/namecoin/files/patch-src_util.h
  head/science/avogadro/files/patch-libavogadro_src_pythonengine__p.h
  head/science/avogadro/files/patch-libavogadro_src_pythonextension__p.h
  head/science/avogadro/files/patch-libavogadro_src_pythoninterpreter.h
  head/science/avogadro/files/patch-libavogadro_src_pythonscript.h
  head/science/avogadro/files/patch-libavogadro_src_pythontool__p.h
Modified:
  head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp

Modified: head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp
==============================================================================
--- head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp	Thu Mar 24 10:14:11 2016	(r411764)
+++ head/devel/qt4-moc/files/patch-src__tools__moc__main.cpp	Thu Mar 24 10:31:07 2016	(r411765)
@@ -10,7 +10,7 @@ What we do to work around the issue is d
 they end up being skipped by moc when it is preprocessing a file.
 --- src/tools/moc/main.cpp.orig	2015-05-07 14:14:44 UTC
 +++ src/tools/moc/main.cpp
-@@ -190,6 +190,13 @@ int runMoc(int _argc, char **_argv)
+@@ -190,6 +190,17 @@ int runMoc(int _argc, char **_argv)
  
      // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
      pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
@@ -21,6 +21,10 @@ they end up being skipped by moc when it
 +    //
 +    // For Boost >= 1.55.
 +    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    // For Boost >= 1.60.
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["BOOST_TT_HAS_PRE_INCREMENT_HPP_INCLUDED"];
  
      QByteArray filename;
      QByteArray output;