1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00
freebsd-ports/editors/openoffice-4/files/patch-boost1.67
Don Lewis efbdfc3f12 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
2018-04-18 21:06:00 +00:00

37 lines
1.1 KiB
Plaintext

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>