[141818] trunk/dports/devel/LucenePlusPlus

[raimue at macports.org]

Revision: 141818
          https://trac.macports.org/changeset/141818
Author:   raimue at macports.org
Date:     2015-10-29 07:27:29 -0700 (Thu, 29 Oct 2015)
Log Message:
-----------
devel/LucenePlusPlus:
Update to version 3.0.7, backport upstream patch to fix build against boost >= 1.58

Modified Paths:
--------------
    trunk/dports/devel/LucenePlusPlus/Portfile

Added Paths:
-----------
    trunk/dports/devel/LucenePlusPlus/files/
    trunk/dports/devel/LucenePlusPlus/files/patch-boost-1.58.diff

Modified: trunk/dports/devel/LucenePlusPlus/Portfile
===================================================================
--- trunk/dports/devel/LucenePlusPlus/Portfile	2015-10-29 14:21:12 UTC (rev 141817)
+++ trunk/dports/devel/LucenePlusPlus/Portfile	2015-10-29 14:27:29 UTC (rev 141818)
@@ -5,7 +5,7 @@
 PortGroup           github 1.0
 PortGroup           cmake 1.0
 
-github.setup        luceneplusplus LucenePlusPlus 3.0.4 rel_
+github.setup        luceneplusplus LucenePlusPlus 3.0.7 rel_
 categories          devel
 platforms           darwin
 maintainers         nomaintainer
@@ -16,11 +16,16 @@
 long_description    Lucene++ is an up to date C++ port of the popular Java Lucene library, \
                     a high-performance, full-featured text search engine.
 
-checksums           rmd160  c6134e1b79ff038d79bb259e8880ef5eac4953ff \
-                    sha256  90dd039153acc444b224e0d230aec69ad1cd112071a10f9f25534a7f1196d922
+checksums           rmd160  5e8f7df944d84bb88f06af4ad4a4ef9cd051c0ca \
+                    sha256  48ff3b7c2a3dff5941144f04cb011b95dbcf164302139c38e05b087f321ea908
 
+patchfiles          patch-boost-1.58.diff
+patch.pre_args      -p1
+
 depends_lib-append  port:boost
 
+cmake.out_of_source yes
+
 # Avoid case-insensitive name clash of ${prefix}/include/term.h from ncurses
 # with Term.h in this build by removing the default -I${prefix}/include argument.
 # The build system will pick up CPATH instead.

Added: trunk/dports/devel/LucenePlusPlus/files/patch-boost-1.58.diff
===================================================================
--- trunk/dports/devel/LucenePlusPlus/files/patch-boost-1.58.diff	                        (rev 0)
+++ trunk/dports/devel/LucenePlusPlus/files/patch-boost-1.58.diff	2015-10-29 14:27:29 UTC (rev 141818)
@@ -0,0 +1,39 @@
+From 1987082cf9278a639d772b4f35a8ae2d34944177 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav at slavik.io>
+Date: Mon, 4 May 2015 18:04:46 +0200
+Subject: [PATCH] Fix compilation with Boost 1.58
+
+1.58 introduces strict type checking in boost::get() and while that's
+good in theory, the VariantUtils code makes it impractical to use.
+Instead, use relaxed_get() to get the old behavior. relaxed_get() didn't
+exist in older versions of Boost, so the code must check BOOST_VERSION.
+
+Fixes #93.
+---
+ include/VariantUtils.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/VariantUtils.h b/include/VariantUtils.h
+index 1e6c243..5a72e59 100644
+--- a/include/VariantUtils.h
++++ b/include/VariantUtils.h
+@@ -8,6 +8,7 @@
+ #define VARIANTUTILS_H
+ 
+ #include <boost/any.hpp>
++#include <boost/version.hpp>
+ #include "Lucene.h"
+ #include "MiscUtils.h"
+ 
+@@ -22,7 +23,11 @@ class LPPAPI VariantUtils {
+ 
+     template <typename TYPE, typename VAR>
+     static TYPE get(VAR var) {
++#if BOOST_VERSION < 105800
+         return var.type() == typeid(TYPE) ? boost::get<TYPE>(var) : TYPE();
++#else
++        return var.type() == typeid(TYPE) ? boost::relaxed_get<TYPE>(var) : TYPE();
++#endif
+     }
+ 
+     template <typename TYPE, typename VAR>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/c6d9191d/attachment.html>