View | Details | Raw Unified | Return to bug 244932 | Differences between
and this patch

Collapse All | Expand All

(-)dovecot-clucene/Makefile (-3 / +3 lines)
Lines 56-62 Link Here
56
ICU_DESC=	Use libicu for FTS unicode normalization
56
ICU_DESC=	Use libicu for FTS unicode normalization
57
LUCENE_DESC=	CLucene FTS support
57
LUCENE_DESC=	CLucene FTS support
58
SOLR_DESC=	Solr FTS support
58
SOLR_DESC=	Solr FTS support
59
TEXTCAT_DESC=	Libtextcat FTS support
59
TEXTCAT_DESC=	Libexttextcat FTS support
60
60
61
GSSAPI_NONE_DESC=	Build without GSSAPI support
61
GSSAPI_NONE_DESC=	Build without GSSAPI support
62
GSSAPI_BASE_DESC=	Use GSSAPI from base
62
GSSAPI_BASE_DESC=	Use GSSAPI from base
Lines 99-105 Link Here
99
ICU_CONFIGURE_WITH=	icu
99
ICU_CONFIGURE_WITH=	icu
100
ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
100
ICU_LIB_DEPENDS=	libicui18n.so:devel/icu
101
101
102
LUCENE_CONFIGURE_WITH=	lucene
102
LUCENE_CONFIGURE_WITH=	lucene stemmer
103
LUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene
103
LUCENE_LIB_DEPENDS=	libclucene-core.so:textproc/clucene
104
104
105
SOLR_CONFIGURE_WITH=	solr
105
SOLR_CONFIGURE_WITH=	solr
Lines 107-113 Link Here
107
			libexpat.so:textproc/expat2
107
			libexpat.so:textproc/expat2
108
108
109
TEXTCAT_CONFIGURE_WITH=	textcat
109
TEXTCAT_CONFIGURE_WITH=	textcat
110
TEXTCAT_LIB_DEPENDS=	libtextcat.so:textproc/libtextcat
110
TEXTCAT_LIB_DEPENDS=	libexttextcat-2.0.so:textproc/libexttextcat
111
111
112
# GSSAPI
112
# GSSAPI
113
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
113
GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
(-)dovecot-clucene/files/patch-configure (+19 lines)
Line 0 Link Here
1
--- configure.orig	2020-03-05 17:36:02.000000000 +0300
2
+++ configure	2020-03-23 13:27:59.882228000 +0300
3
@@ -28652,13 +28652,13 @@
4
 
5
 
6
   if test $want_stemmer != no; then
7
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lstemmer" >&5
8
-$as_echo_n "checking for sb_stemmer_new in -lstemmer... " >&6; }
9
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lclucene-contribs-lib" >&5
10
+$as_echo_n "checking for sb_stemmer_new in -lclucene-contribs-lib... " >&6; }
11
 if ${ac_cv_lib_stemmer_sb_stemmer_new+:} false; then :
12
   $as_echo_n "(cached) " >&6
13
 else
14
   ac_check_lib_save_LIBS=$LIBS
15
-LIBS="-lstemmer  $LIBS"
16
+LIBS="-lclucene-contribs-lib  $LIBS"
17
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18
 /* end confdefs.h.  */
19
 
(-)dovecot-clucene/files/patch-plugins_fts-lucene_Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/plugins/fts-lucene/Makefile.in.orig
2
+++ src/plugins/fts-lucene/Makefile.in
3
@@ -516,7 +516,7 @@
4
 module_LTLIBRARIES = \
5
 	lib21_fts_lucene_plugin.la
6
 
7
-@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer
8
+@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib
9
 @BUILD_FTS_STEMMER_TRUE@SHOWBALL_SOURCES = Snowball.cc
10
 @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE@TEXTCAT_LIBS = -ltextcat
11
 @BUILD_FTS_EXTTEXTCAT_TRUE@TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS)
(-)dovecot-clucene/files/patch-src_lib-fts_Makefile.in (+11 lines)
Line 0 Link Here
1
--- src/lib-fts/Makefile.in.orig
2
+++ src/lib-fts/Makefile.in
3
@@ -549,7 +549,7 @@
4
 	word-break-data.c \
5
 	stopwords/stopwords_malformed.txt
6
 
7
-@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer
8
+@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib
9
 @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE@TEXTCAT_LIBS = -ltextcat
10
 @BUILD_FTS_EXTTEXTCAT_TRUE@TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS)
11
 @BUILD_LIBICU_TRUE@ICU_SOURCES = fts-icu.c
(-)dovecot-clucene/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c (+11 lines)
Line 0 Link Here
1
--- src/lib-fts/fts-filter-stemmer-snowball.c.orig
2
+++ src/lib-fts/fts-filter-stemmer-snowball.c
3
@@ -6,7 +6,7 @@
4
 
5
 #ifdef HAVE_FTS_STEMMER
6
 
7
-#include <libstemmer.h>
8
+#include <CLucene/snowball/libstemmer.h>
9
 
10
 struct fts_filter_stemmer_snowball {
11
 	struct fts_filter filter;
(-)dovecot-clucene/files/patch-src_plugins_fts-lucene_SnowballFilter.h (+10 lines)
Line 0 Link Here
1
--- src/plugins/fts-lucene/SnowballFilter.h.orig
2
+++ src/plugins/fts-lucene/SnowballFilter.h
3
@@ -8,7 +8,7 @@
4
 #define _lucene_analysis_snowball_filter_
5
 
6
 #include "CLucene/analysis/AnalysisHeader.h"
7
-#include "libstemmer.h"
8
+#include "CLucene/snowball/libstemmer.h"
9
 
10
 CL_NS_DEF2(analysis,snowball)

Return to bug 244932