mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

Fix editors/openoffice-4 build with boost 1.67 by checking the boost

Browse Source 
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
This commit is contained in:
Don Lewis 2018-04-18 21:06:00 +00:00
parent ee16311120
commit efbdfc3f12
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467736
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editors/openoffice-4/Makefile
View File

@ -48,7 +48,6 @@ LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
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 \

36
editors/openoffice-4/files/patch-boost1.67 Normal file
View File

@ -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>