[tracker-miners] common: Remove unused tracker-language.[ch] and libstemmer dep



commit 277b2a868de1ac24d9950678e9bb49d23b2f82c3
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Dec 16 14:53:28 2017 +0000

    common: Remove unused tracker-language.[ch] and libstemmer dep

 meson.build                                     |   15 -
 meson_options.txt                               |    2 -
 src/libtracker-miners-common/Makefile.am        |    6 +-
 src/libtracker-miners-common/meson.build        |    1 -
 src/libtracker-miners-common/tracker-common.h   |    1 -
 src/libtracker-miners-common/tracker-language.c |  572 -----------------------
 src/libtracker-miners-common/tracker-language.h |   72 ---
 7 files changed, 2 insertions(+), 667 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2efc7de..c8c8717 100644
--- a/meson.build
+++ b/meson.build
@@ -79,20 +79,6 @@ add_project_arguments('-Wno-pointer-sign', language: 'c')
 add_project_arguments('-DTRACKER_COMPILATION', language: 'c')
 
 ##################################################################
-# Check for libtracker-common, make sure libstemmer exists
-##################################################################
-
-have_libstemmer = false
-if get_option('stemmer') != 'no'
-    stemmer = cc.find_library('stemmer')
-    if stemmer.found()
-        have_libstemmer = true
-    elif get_option('stemmer') == 'yes'
-        error('stemmer support explicitly requested, but stemmer library couldn\'t be found')
-    endif
-endif
-
-##################################################################
 # Check for libtracker-common: battery/mains power detection
 #
 # By default, AUTO with this order of preference:
@@ -284,7 +270,6 @@ conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
 conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
 conf.set('HAVE_LIBEXIF', libexif.found())
 conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
-conf.set('HAVE_LIBSTEMMER', have_libstemmer)
 conf.set('HAVE_LIBSECCOMP', libseccomp.found())
 conf.set('HAVE_UPOWER', battery_detection_library_name == 'upower')
 
diff --git a/meson_options.txt b/meson_options.txt
index 38e8b2d..4a7f442 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,8 +40,6 @@ option('generic_media_extractor', type: 'combo', choices: ['auto', 'gstreamer',
        description: 'Enables one of the (gstreamer, libav, auto) generic media extractor backends')
 option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer',
        description: 'When GStreamer is used, this enables one of the (discoverer, gupnp) GStreamer backends')
-option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
-       description: 'Enable stemming words while indexing')
 option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',
        description: 'Unicode support library to use')
 
diff --git a/src/libtracker-miners-common/Makefile.am b/src/libtracker-miners-common/Makefile.am
index 24c0d76..0b740ad 100644
--- a/src/libtracker-miners-common/Makefile.am
+++ b/src/libtracker-miners-common/Makefile.am
@@ -19,8 +19,7 @@ libtracker_miners_common_la_SOURCES = \
        tracker-seccomp.c \
        tracker-type-utils.c \
        tracker-utils.c \
-       tracker-locale.c \
-       tracker-language.c
+       tracker-locale.c
 
 noinst_HEADERS = \
        tracker-dbus.h \
@@ -35,8 +34,7 @@ noinst_HEADERS = \
        tracker-seccomp.h \
        tracker-type-utils.h \
        tracker-utils.h \
-       tracker-locale.h \
-       tracker-language.h
+       tracker-locale.h
 
 libtracker_miners_common_la_LIBADD = \
        $(BUILD_LIBS) \
diff --git a/src/libtracker-miners-common/meson.build b/src/libtracker-miners-common/meson.build
index 9268e2b..4f2cd2e 100644
--- a/src/libtracker-miners-common/meson.build
+++ b/src/libtracker-miners-common/meson.build
@@ -17,7 +17,6 @@ tracker_miners_common_sources = [
   'tracker-type-utils.c',
   'tracker-utils.c',
   'tracker-locale.c',
-  'tracker-language.c',
   'tracker-seccomp.c',
   enums[0], enums[1],
 ]
diff --git a/src/libtracker-miners-common/tracker-common.h b/src/libtracker-miners-common/tracker-common.h
index aa0d42b..ed9bcad 100644
--- a/src/libtracker-miners-common/tracker-common.h
+++ b/src/libtracker-miners-common/tracker-common.h
@@ -33,7 +33,6 @@
 #include "tracker-domain-ontology.h"
 #include "tracker-file-utils.h"
 #include "tracker-ioprio.h"
-#include "tracker-language.h"
 #include "tracker-log.h"
 #include "tracker-sched.h"
 #include "tracker-seccomp.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]