I have made the following changes intended for : nemo:devel:mw / tracker Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.merproject.org//request/show/275 Thank You, Martin Kampas [This message was auto-generated] --- Request # 275: Messages from BOSS: State: review at 2013-05-02T12:13:12 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:martyone:branches:nemo:devel:mw / tracker -> nemo:devel:mw / tracker changes files: -------------- --- tracker.changes +++ tracker.changes @@ -0,0 +1,3 @@ +* Thu May 02 2013 Martin Kampas <[email protected]> - 0.14.4 +- Add tracker-disable-userguide-and-applications-miners.patch + new: ---- tracker-disable-userguide-and-applications-miners.patch spec files: ----------- --- tracker.spec +++ tracker.spec @@ -38,6 +38,7 @@ Patch15: tracker-miner-fs-deal-with-data-inserted-by-other-apps.patch Patch16: tracker-tests-400-extractor-skip-unsupported-file-types.patch Patch17: tracker-tests-exclude-200-backup-restore.patch +Patch18: tracker-disable-userguide-and-applications-miners.patch Requires: gst-plugins-base >= 0.10 Requires: unzip Requires(post): /sbin/ldconfig @@ -173,6 +174,8 @@ %patch16 -p1 # tracker-tests-exclude-200-backup-restore.patch %patch17 -p1 +# tracker-disable-userguide-and-applications-miners.patch +%patch18 -p1 # >> setup # << setup other changes: -------------- ++++++ tracker-disable-userguide-and-applications-miners.patch (new) --- tracker-disable-userguide-and-applications-miners.patch +++ tracker-disable-userguide-and-applications-miners.patch @@ -0,0 +1,329 @@ +Disable the userguide and applications miners, they are useless and crash prone + +diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am +index eb1c8c6..635196b 100644 +--- a/data/dbus/Makefile.am ++++ b/data/dbus/Makefile.am +@@ -18,10 +18,8 @@ config_noinst = \ + # Services + service_in_files = \ + org.freedesktop.Tracker1.service.in \ +- org.freedesktop.Tracker1.Miner.Applications.service.in \ + org.freedesktop.Tracker1.Miner.EMails.service.in \ + org.freedesktop.Tracker1.Miner.Files.service.in \ +- org.freedesktop.Tracker1.Miner.Userguides.service.in \ + org.freedesktop.Tracker1.Miner.Flickr.service.in \ + org.freedesktop.Tracker1.Miner.RSS.service.in \ + org.freedesktop.Tracker1.Extract.service.in \ +@@ -39,13 +37,7 @@ service_DATA = \ + + if HAVE_TRACKER_MINER_FS + service_DATA += \ +- org.freedesktop.Tracker1.Miner.Files.service \ +- org.freedesktop.Tracker1.Miner.Applications.service +- +-if HAVE_MAEMO +-# Userguides are done in the miner-fs process +-service_DATA += org.freedesktop.Tracker1.Miner.Userguides.service +-endif ++ org.freedesktop.Tracker1.Miner.Files.service + endif + + if HAVE_TRACKER_MINER_EVOLUTION +diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am +index a0abed6..2c46319 100644 +--- a/data/miners/Makefile.am ++++ b/data/miners/Makefile.am +@@ -1,16 +1,12 @@ + include $(top_srcdir)/Makefile.decl + + desktop_in_in_files = \ +- tracker-miner-userguides.desktop.in.in \ +- tracker-miner-applications.desktop.in.in \ + tracker-miner-evolution.desktop.in.in \ + tracker-miner-files.desktop.in.in \ + tracker-miner-flickr.desktop.in.in \ + tracker-miner-rss.desktop.in.in + + desktop_in_files = \ +- tracker-miner-userguides.desktop.in \ +- tracker-miner-applications.desktop.in \ + tracker-miner-evolution.desktop.in \ + tracker-miner-files.desktop.in \ + tracker-miner-flickr.desktop.in \ +@@ -22,13 +18,7 @@ tracker_miners_DATA = + + if HAVE_TRACKER_MINER_FS + tracker_miners_DATA += \ +- tracker-miner-applications.desktop \ + tracker-miner-files.desktop +- +-if HAVE_MAEMO +-# Userguides are done in the miner-fs process +-tracker_miners_DATA += tracker-miner-userguides.desktop +-endif + endif + + if HAVE_TRACKER_MINER_EVOLUTION +diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am +index 964a4ce..65f7ca2 100644 +--- a/src/miners/fs/Makefile.am ++++ b/src/miners/fs/Makefile.am +@@ -32,8 +32,6 @@ tracker_miner_fs_SOURCES = \ + tracker-config.c \ + tracker-config.h \ + tracker-main.c \ +- tracker-miner-applications.c \ +- tracker-miner-applications.h \ + tracker-miner-locale.c \ + tracker-miner-locale.h \ + tracker-miner-files.c \ +@@ -56,14 +54,6 @@ tracker_miner_fs_LDADD = \ + $(BUILD_LIBS) \ + $(TRACKER_MINER_FS_LIBS) + +-if HAVE_MAEMO +-tracker_miner_fs_SOURCES += \ +- tracker-miner-userguides.c \ +- tracker-miner-userguides.h +-tracker_miner_fs_CFLAGS = $(LIBXML2_CFLAGS) +-tracker_miner_fs_LDADD += $(LIBXML2_LIBS) +-endif +- + if HAVE_MEEGOTOUCH + tracker_miner_fs_SOURCES += \ + tracker-miner-meego.cpp \ +diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c +index 5ea2708..c244e8e 100644 +--- a/src/miners/fs/tracker-main.c ++++ b/src/miners/fs/tracker-main.c +@@ -44,8 +44,6 @@ + + #include "tracker-config.h" + #include "tracker-marshal.h" +-#include "tracker-miner-userguides.h" +-#include "tracker-miner-applications.h" + #include "tracker-miner-files.h" + #include "tracker-miner-files-index.h" + #include "tracker-writeback.h" +@@ -63,16 +61,10 @@ + #define SECONDS_PER_DAY 60 * 60 * 24 + + #define OPTION_DISABLE_FILES "files" +-#define OPTION_DISABLE_APPLICATIONS "applications" +-#define OPTION_DISABLE_USERGUIDES "userguides" + + typedef enum { + DISABLE_NONE, + DISABLE_FILES, +- DISABLE_APPLICATIONS, +-#ifdef HAVE_MAEMO +- DISABLE_USERGUIDES, +-#endif /* HAVE_MAEMO */ + } DisableOption; + + static gboolean miner_disable_option_arg_func (const gchar *option_value, +@@ -119,10 +111,6 @@ static GOptionEntry entries[] = { + G_OPTION_ARG_CALLBACK, miner_disable_option_arg_func, + N_("Disable miners started as part of this process, options include" + ": '" OPTION_DISABLE_FILES "'" +- ", '" OPTION_DISABLE_APPLICATIONS "'" +-#ifdef HAVE_MAEMO +- ", '" OPTION_DISABLE_USERGUIDES "'" +-#endif /* HAVE_MAEMO */ + ), + N_("MINER") }, + { "version", 'V', 0, +@@ -145,22 +133,11 @@ miner_disable_option_arg_func (const gchar *option_value, + + if (!value || *value == '\0') { + /* Show help */ +-#ifdef HAVE_MAEMO + g_set_error_literal (error, + G_OPTION_ERROR, + G_OPTION_ERROR_FAILED, + "A value is required, either " +- "'" OPTION_DISABLE_FILES "', " +- "'" OPTION_DISABLE_APPLICATIONS "' or " +- "'" OPTION_DISABLE_USERGUIDES "'"); +-#else /* HAVE_MAEMO */ +- g_set_error_literal (error, +- G_OPTION_ERROR, +- G_OPTION_ERROR_FAILED, +- "A value is required, either " +- "'" OPTION_DISABLE_FILES "', " +- "'" OPTION_DISABLE_APPLICATIONS "'"); +-#endif /* HAVE_MAEMO */ ++ "'" OPTION_DISABLE_FILES "'"); + return FALSE; + } + +@@ -168,12 +145,6 @@ miner_disable_option_arg_func (const gchar *option_value, + + if (strcmp (value_casefold, OPTION_DISABLE_FILES) == 0) { + option = DISABLE_FILES; +- } else if (strcmp (value_casefold, OPTION_DISABLE_APPLICATIONS) == 0) { +- option = DISABLE_APPLICATIONS; +-#ifdef HAVE_MAEMO +- } else if (strcmp (value_casefold, OPTION_DISABLE_USERGUIDES) == 0) { +- option = DISABLE_USERGUIDES; +-#endif /* HAVE_MAEMO */ + } else { + g_set_error (error, + G_OPTION_ERROR, +@@ -381,15 +352,6 @@ miner_disabled_check (void) + case DISABLE_FILES: + disabled = strcmp (name_casefold, OPTION_DISABLE_FILES) == 0; + break; +- case DISABLE_APPLICATIONS: +- disabled = strcmp (name_casefold, OPTION_DISABLE_APPLICATIONS) == 0; +- break; +- +-#ifdef HAVE_MAEMO +- case DISABLE_USERGUIDES: +- disabled = strcmp (name_casefold, OPTION_DISABLE_USERGUIDES) == 0; +- break; +-#endif /* HAVE_MAEMO */ + + default: + g_assert_not_reached (); +@@ -845,11 +807,8 @@ int + main (gint argc, gchar *argv[]) + { + TrackerConfig *config; +- TrackerMiner *miner_applications, *miner_files; ++ TrackerMiner *miner_files; + TrackerMinerFilesIndex *miner_files_index; +-#ifdef HAVE_MAEMO +- TrackerMiner *miner_userguides; +-#endif /* HAVE_MAEMO */ + GOptionContext *context; + GError *error = NULL; + gchar *log_filename = NULL; +@@ -957,23 +916,9 @@ main (gint argc, gchar *argv[]) + return EXIT_FAILURE; + } + +- /* Create miner for applications */ +- miner_applications = tracker_miner_applications_new (&error); +- if (!miner_applications) { +- g_critical ("Couldn't create new Applications miner: '%s'", +- error ? error->message : "unknown error"); +- g_object_unref (miner_files); +- tracker_writeback_shutdown (); +- g_object_unref (config); +- tracker_log_shutdown (); +- g_array_free (disable_options, TRUE); +- return EXIT_FAILURE; +- } +- + /* Create new TrackerMinerFilesIndex object */ + miner_files_index = tracker_miner_files_index_new (TRACKER_MINER_FILES (miner_files)); + if (!miner_files_index) { +- g_object_unref (miner_applications); + g_object_unref (miner_files); + tracker_writeback_shutdown (); + g_object_unref (config); +@@ -982,23 +927,6 @@ main (gint argc, gchar *argv[]) + return EXIT_FAILURE; + } + +-#ifdef HAVE_MAEMO +- /* Create miner for userguides */ +- miner_userguides = tracker_miner_userguides_new (&error); +- if (!miner_userguides) { +- g_critical ("Couldn't create new User Guides miner: '%s'", +- error ? error->message : "unknown error"); +- g_object_unref (miner_applications); +- g_object_unref (miner_files); +- g_object_unref (miner_files_index); +- tracker_writeback_shutdown (); +- g_object_unref (config); +- tracker_log_shutdown (); +- g_array_free (disable_options, TRUE); +- return EXIT_FAILURE; +- } +-#endif /* HAVE_MAEMO */ +- + /* Check if we should crawl and if we should force mtime + * checking based on the config. + */ +@@ -1036,52 +964,7 @@ main (gint argc, gchar *argv[]) + G_CALLBACK (miner_finished_cb), + NULL); + +- /* Configure applications miner */ +- tracker_miner_fs_set_initial_crawling (TRACKER_MINER_FS (miner_applications), do_crawling); +- +-#ifdef HAVE_MAEMO +- /* Configure userguides miner */ +- tracker_miner_fs_set_initial_crawling (TRACKER_MINER_FS (miner_userguides), do_crawling); +-#endif /* HAVE_MAEMO */ +- +- /* If a locale change was detected, always do mtime checks */ +- if (tracker_miner_applications_detect_locale_changed (miner_applications)) { +- if (!do_mtime_checking) +- g_debug ("Forcing mtime check in applications miner as locale change was detected"); +- tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_applications), TRUE); +- } else { +- tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_applications), do_mtime_checking); +- } +- +- +-#ifdef HAVE_MAEMO +- /* If a locale change was detected, always do mtime checks */ +- if (tracker_miner_userguides_detect_locale_changed (miner_userguides)) { +- if (!do_mtime_checking) +- g_debug ("Forcing mtime check in userguides miner as locale change was detected"); +- tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_userguides), TRUE); +- } else { +- tracker_miner_fs_set_mtime_checking (TRACKER_MINER_FS (miner_userguides), do_mtime_checking); +- } +-#endif /* HAVE_MAEMO */ +- +- g_signal_connect (miner_applications, "finished", +- G_CALLBACK (miner_finished_cb), +- NULL); +- +-#ifdef HAVE_MAEMO +- g_signal_connect (miner_userguides, "finished", +- G_CALLBACK (miner_finished_cb), +- NULL); +-#endif /* HAVE_MAEMO */ +- +- /* Setup miners, applications first in list */ +-#ifdef HAVE_MAEMO +- miners = g_slist_prepend (miners, miner_userguides); +-#endif /* HAVE_MAEMO */ +- + miners = g_slist_prepend (miners, miner_files); +- miners = g_slist_prepend (miners, miner_applications); + + tracker_thumbnailer_init (); + +@@ -1095,11 +978,7 @@ main (gint argc, gchar *argv[]) + store_available = store_is_available (); + + if (miners_timeout_id == 0 && +- !miner_needs_check (miner_files, store_available) && +-#ifdef HAVE_MAEMO +- !miner_needs_check (miner_userguides, store_available) && +-#endif +- !miner_needs_check (miner_applications, store_available)) { ++ !miner_needs_check (miner_files, store_available)) { + tracker_db_manager_set_need_mtime_check (FALSE); + } + +diff --git a/tests/functional-tests/common/utils/helpers.py b/tests/functional-tests/common/utils/helpers.py +index d0b1a81..6d15cf7 100644 +--- a/tests/functional-tests/common/utils/helpers.py ++++ b/tests/functional-tests/common/utils/helpers.py +@@ -306,8 +306,6 @@ class MinerFsHelper (Helper): + BUS_NAME = cfg.MINERFS_BUSNAME + + FLAGS = ['--initial-sleep=0'] +- if cfg.haveMaemo: +- FLAGS.append ('--disable-miner=userguides') + + def _stop_process (self): + if options.is_manual_start (): ++++++ tracker.yaml --- tracker.yaml +++ tracker.yaml @@ -27,6 +27,7 @@ - tracker-miner-fs-deal-with-data-inserted-by-other-apps.patch - tracker-tests-400-extractor-skip-unsupported-file-types.patch - tracker-tests-exclude-200-backup-restore.patch + - tracker-disable-userguide-and-applications-miners.patch ExtraSources: - tracker-store.service;%{_libdir}/systemd/user/
