svn commit: r467736 - in head/editors/openoffice-4: . files

[Don Lewis]

Author: truckman
Date: Wed Apr 18 21:06:00 2018
New Revision: 467736
URL: https://svnweb.freebsd.org/changeset/ports/467736

Log:
  Fix editors/openoffice-4 build with boost 1.67 by checking the boost
  version and including <boost/next_prior.hpp> instead of
  <boost/utility.hpp> when the new version of boost is detected.
  
  PR:		227553
  Reported by:	jbeich

Added:
  head/editors/openoffice-4/files/patch-boost1.67   (contents, props changed)
Modified:
  head/editors/openoffice-4/Makefile

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Wed Apr 18 20:54:46 2018	(r467735)
+++ head/editors/openoffice-4/Makefile	Wed Apr 18 21:06:00 2018	(r467736)
@@ -48,7 +48,6 @@ LICENSE_PERMS_TWAIN=	dist-mirror dist-sell pkg-mirror 
 LICENSE_PERMS_W3C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64
-BROKEN=		fails to build with boost 1.67, see bug 227553
 
 BUILD_DEPENDS=								\
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip		\

Added: head/editors/openoffice-4/files/patch-boost1.67
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-boost1.67	Wed Apr 18 21:06:00 2018	(r467736)
@@ -0,0 +1,36 @@
+Index: basegfx/source/range/b2drangeclipper.cxx
+===================================================================
+--- basegfx/source/range/b2drangeclipper.cxx	(revision 1829412)
++++ basegfx/source/range/b2drangeclipper.cxx	(working copy)
+@@ -35,7 +35,12 @@
+ 
+ #include <o3tl/vector_pool.hxx>
+ #include <boost/bind.hpp>
+-#include <boost/utility.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 106700
++# include <boost/utility.hpp>
++#else
++# include <boost/next_prior.hpp>
++#endif
+ 
+ #include <algorithm>
+ #include <deque>
+Index: slideshow/source/inc/listenercontainer.hxx
+===================================================================
+--- slideshow/source/inc/listenercontainer.hxx	(revision 1829412)
++++ slideshow/source/inc/listenercontainer.hxx	(working copy)
+@@ -24,7 +24,12 @@
+ #define INCLUDED_SLIDESHOW_LISTENERCONTAINER_HXX
+ 
+ #include <osl/mutex.hxx>
+-#include <boost/utility.hpp>
++#include <boost/version.hpp>
++#if BOOST_VERSION < 106700
++# include <boost/utility.hpp>
++#else
++# include <boost/next_prior.hpp>
++#endif
+ #include <algorithm>
+ #include <vector>
+