diff options
| author | thierry <thierry@FreeBSD.org> | 2013-03-11 00:16:40 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2013-03-11 00:16:40 +0800 |
| commit | a8150e8799b0ae70af21e5cf376501f7c1e7a603 (patch) | |
| tree | 638dca0194d3be56d572e90ebbaeea0cf618556e | |
| parent | 610e02e6476f4a6b3b0521f9f8816d8993cec5de (diff) | |
| download | freebsd-ports-gnome-a8150e8799b0ae70af21e5cf376501f7c1e7a603.tar.gz freebsd-ports-gnome-a8150e8799b0ae70af21e5cf376501f7c1e7a603.tar.zst freebsd-ports-gnome-a8150e8799b0ae70af21e5cf376501f7c1e7a603.zip | |
Chase boost-spirit reorganization in order to re-enable Sherlock.
| -rw-r--r-- | deskutils/pinot/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp | 17 | ||||
| -rw-r--r-- | deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp | 24 | ||||
| -rw-r--r-- | deskutils/pinot/files/patch-configure | 33 |
4 files changed, 72 insertions, 3 deletions
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index b8240233a5d2..0ca8d7f58a74 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -3,6 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.05 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ diff --git a/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp b/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp new file mode 100644 index 000000000000..a4670a6754b0 --- /dev/null +++ b/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp @@ -0,0 +1,17 @@ +--- IndexSearch/PluginWebEngine.cpp.orig 2012-04-08 10:39:34.000000000 +0200 ++++ IndexSearch/PluginWebEngine.cpp 2013-03-10 17:09:52.000000000 +0100 +@@ -165,14 +165,12 @@ + } + + string extension(fileName.substr(pos + 1)); +-#ifdef HAVE_BOOST_SPIRIT_CORE_HPP + if (strncasecmp(extension.c_str(), "src", 3) == 0) + { + pluginType = "sherlock"; + return new SherlockParser(fileName); + } + else +-#endif + if (strncasecmp(extension.c_str(), "xml", 3) == 0) + { + pluginType = "opensearch"; diff --git a/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp b/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp new file mode 100644 index 000000000000..03755b5ad680 --- /dev/null +++ b/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp @@ -0,0 +1,24 @@ +--- IndexSearch/SherlockParser.cpp.orig 2012-04-08 10:39:34.000000000 +0200 ++++ IndexSearch/SherlockParser.cpp 2013-03-10 17:03:22.000000000 +0100 +@@ -21,10 +21,17 @@ + #include <set> + #include <iostream> + #include <cstring> +-#include <boost/spirit/core.hpp> +-#include <boost/spirit/actor/push_back_actor.hpp> +-#include <boost/spirit/actor/insert_at_actor.hpp> +-#include <boost/spirit/utility/confix.hpp> ++#ifdef HAVE_BOOST_SPIRIT_CORE_HPP ++# include <boost/spirit/core.hpp> ++# include <boost/spirit/actor/push_back_actor.hpp> ++# include <boost/spirit/actor/insert_at_actor.hpp> ++# include <boost/spirit/utility/confix.hpp> ++#else ++# include <boost/spirit.hpp> ++# include <boost/spirit/home/classic/actor/push_back_actor.hpp> ++# include <boost/spirit/home/classic/actor/insert_at_actor.hpp> ++# include <boost/spirit/home/classic/utility/confix.hpp> ++#endif + + #include "StringManip.h" + #include "Url.h" diff --git a/deskutils/pinot/files/patch-configure b/deskutils/pinot/files/patch-configure index f3992c97f523..2e79f84e27f5 100644 --- a/deskutils/pinot/files/patch-configure +++ b/deskutils/pinot/files/patch-configure @@ -1,6 +1,33 @@ ---- configure.orig 2012-06-10 15:26:06.000000000 +0200 -+++ configure 2012-07-19 18:59:05.000000000 +0200 -@@ -18840,7 +18840,7 @@ +--- configure.orig 2013-03-03 03:25:56.000000000 +0100 ++++ configure 2013-03-10 16:52:56.000000000 +0100 +@@ -18010,6 +18010,26 @@ + HAVE_BOOST_SPIRIT_FALSE= + fi + ++else ++ for ac_header in boost/spirit.hpp ++do : ++ ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit.hpp" "ac_cv_header_boost_spirit_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_spirit_hpp" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_BOOST_SPIRIT_HPP 1 ++_ACEOF ++ if true; then ++ HAVE_BOOST_SPIRIT_TRUE= ++ HAVE_BOOST_SPIRIT_FALSE='#' ++else ++ HAVE_BOOST_SPIRIT_TRUE='#' ++ HAVE_BOOST_SPIRIT_FALSE= ++fi ++ ++fi ++ ++done ++ + + fi + +@@ -18169,7 +18189,7 @@ HAVE_TEXTCAT_CAT_FALSE= fi |