From 9eb0e757995b230fc6124c95bd41aa3c287635b4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 22 Feb 2012 11:49:02 +0100 Subject: [PATCH] Update to 0.12.10 --- sources | 2 +- tracker-g-thread-init.patch | 551 ------------------------------------ tracker-libemail.patch | 474 ++++++++++++++++++++++++++++--- tracker.spec | 10 +- 4 files changed, 449 insertions(+), 588 deletions(-) delete mode 100644 tracker-g-thread-init.patch diff --git a/sources b/sources index 7c9b30b..429268d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -437ce980610ae57edead331e2820578e tracker-0.12.9.tar.xz +1ca82c48e79002df9f3a5487d5979513 tracker-0.12.10.tar.xz diff --git a/tracker-g-thread-init.patch b/tracker-g-thread-init.patch deleted file mode 100644 index 295056d..0000000 --- a/tracker-g-thread-init.patch +++ /dev/null @@ -1,551 +0,0 @@ -commit 9295f5952a5d1a8ae8c461adef7e36caee01c676 -Author: Jürg Billeter -Date: Sun Nov 27 15:10:21 2011 +0100 - - Remove g_thread_init calls - - Calling g_thread_init with GLib 2.31 requires explicit dependency on - gthread-2.0. However, g_type_init initializes threads since GLib 2.24, - so it is no longer needed. - -diff --git a/configure.ac b/configure.ac -index f67f91e..9c234ba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -246,7 +246,6 @@ PKG_CHECK_MODULES(LIBTRACKER_EXTRACT, [$LIBTRACKER_EXTRACT_REQUIRED]) - # Check requirements for libtracker-fts - LIBTRACKER_FTS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - sqlite3 >= $SQLITE_REQUIRED" - - PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED]) -@@ -267,7 +266,6 @@ PKG_CHECK_MODULES(LIBTRACKER_SPARQL, [$LIBTRACKER_SPARQL_REQUIRED]) - # Check requirements for tracker-control - TRACKER_CONTROL_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - uuid" - - PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED]) -@@ -275,7 +273,6 @@ PKG_CHECK_MODULES(TRACKER_CONTROL, [$TRACKER_CONTROL_REQUIRED]) - # Check requirements for tracker-explorer - TRACKER_EXPLORER_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gee-1.0 >= $GEE_REQUIRED" -@@ -294,7 +291,6 @@ PKG_CHECK_MODULES(TRACKER_RESDUMP, [$TRACKER_RESDUMP_REQUIRED], - # Check requirements for tracker-store - TRACKER_STORE_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED - sqlite3 >= $SQLITE_REQUIRED" - -@@ -305,7 +301,6 @@ TRACKER_STORE_LIBS="$TRACKER_STORE_LIBS -lz -lm" - # Check requirements for tracker-extract - TRACKER_EXTRACT_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED" - - PKG_CHECK_MODULES(TRACKER_EXTRACT, [$TRACKER_EXTRACT_REQUIRED]) -@@ -318,7 +313,6 @@ PKG_CHECK_MODULES(TRACKER_EXTRACT_MODULES, [$TRACKER_EXTRACT_MODULES_REQUIRED]) - # Check requirements for tracker-writeback - TRACKER_WRITEBACK_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED" - - PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED]) -@@ -326,7 +320,6 @@ PKG_CHECK_MODULES(TRACKER_WRITEBACK, [$TRACKER_WRITEBACK_REQUIRED]) - # Check requirements for tracker-miner-fs - TRACKER_MINER_FS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED" - - PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED]) -@@ -429,15 +422,13 @@ TRACKER_MINER_FLICKR_LIBS="$TRACKER_MINER_FLICKR_LIBS -lz -lm" - - # Check requirements for tracker-utils - TRACKER_UTILS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED -- gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED" -+ gio-unix-2.0 >= $GLIB_REQUIRED" - - PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED]) - - # Check requirements for tracker-needle - TRACKER_NEEDLE_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED" - -@@ -448,7 +439,6 @@ PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRACKER_NEEDLE_REQUIRED], - # Check requirements for tracker-preferences - TRACKER_PREFERENCES_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED" - -@@ -459,7 +449,6 @@ PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED], - # Check requirements for tracker-search-bar - TRACKER_SEARCH_BAR_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED -- gthread-2.0 >= $GLIB_REQUIRED - gmodule-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED -diff --git a/examples/libtracker-miner/tracker-main.c b/examples/libtracker-miner/tracker-main.c -index 5f24a68..9bebd5f 100644 ---- a/examples/libtracker-miner/tracker-main.c -+++ b/examples/libtracker-miner/tracker-main.c -@@ -195,10 +195,6 @@ main (int argc, char *argv[]) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - main_loop = g_main_loop_new (NULL, FALSE); - - miner = tracker_miner_test_new ("test"); -diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c -index 151c275..1873a77 100644 ---- a/src/miners/fs/tracker-main.c -+++ b/src/miners/fs/tracker-main.c -@@ -696,10 +696,6 @@ main (gint argc, gchar *argv[]) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - setlocale (LC_ALL, ""); - - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -diff --git a/src/miners/rss/tracker-main.c b/src/miners/rss/tracker-main.c -index b3b2501..e79d15f 100644 ---- a/src/miners/rss/tracker-main.c -+++ b/src/miners/rss/tracker-main.c -@@ -61,7 +61,6 @@ main (int argc, char **argv) - const gchar *error_message; - - g_type_init (); -- g_thread_init (NULL); - - setlocale (LC_ALL, ""); - -diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c -index 9591eaf..48dfe8a 100644 ---- a/src/tracker-control/tracker-control.c -+++ b/src/tracker-control/tracker-control.c -@@ -68,10 +68,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - /* Translators: this messagge will apper immediately after the */ - /* usage string - Usage: COMMAND [OPTION]... */ - context = g_option_context_new (_(" - Manage Tracker processes and data")); -diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c -index 918e051..6ad8213 100644 ---- a/src/tracker-utils/tracker-import.c -+++ b/src/tracker-utils/tracker-import.c -@@ -104,10 +104,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - connection = tracker_sparql_connection_get (NULL, &error); - - if (!connection) { -diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c -index d06eff6..dceb73d 100644 ---- a/src/tracker-utils/tracker-info.c -+++ b/src/tracker-utils/tracker-info.c -@@ -349,10 +349,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - connection = tracker_sparql_connection_get (NULL, &error); - - if (!connection) { -diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c -index 7f2e1c1..9c33d15 100644 ---- a/src/tracker-utils/tracker-search.c -+++ b/src/tracker-utils/tracker-search.c -@@ -1465,10 +1465,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - - #if HAVE_TRACKER_FTS - /* Only check stopwords if FTS is enabled */ -diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c -index a12b123..317468d 100644 ---- a/src/tracker-utils/tracker-sparql.c -+++ b/src/tracker-utils/tracker-sparql.c -@@ -280,10 +280,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - connection = tracker_sparql_connection_get (NULL, &error); - - if (!connection) { -diff --git a/src/tracker-utils/tracker-stats.c b/src/tracker-utils/tracker-stats.c -index 64d33de..8748e5c 100644 ---- a/src/tracker-utils/tracker-stats.c -+++ b/src/tracker-utils/tracker-stats.c -@@ -81,10 +81,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - connection = tracker_sparql_connection_get (NULL, &error); - - if (!connection) { -diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c -index b3a9a8c..d900d58 100644 ---- a/src/tracker-utils/tracker-tag.c -+++ b/src/tracker-utils/tracker-tag.c -@@ -933,10 +933,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - connection = tracker_sparql_connection_get (NULL, &error); - - if (!connection) { -diff --git a/src/tracker-writeback/tracker-main.c b/src/tracker-writeback/tracker-main.c -index f55c4c7..dc703ae 100644 ---- a/src/tracker-writeback/tracker-main.c -+++ b/src/tracker-writeback/tracker-main.c -@@ -85,8 +85,6 @@ main (int argc, - gchar *log_filename; - guint shutdown_timeout; - -- g_thread_init (NULL); -- - g_type_init (); - - /* Set up locale */ -diff --git a/tests/gvdb/gvdb-test.c b/tests/gvdb/gvdb-test.c -index a960f2a..2d4730d 100644 ---- a/tests/gvdb/gvdb-test.c -+++ b/tests/gvdb/gvdb-test.c -@@ -234,7 +234,6 @@ gint - main (gint argc, gchar **argv) - { - g_type_init (); -- g_thread_init (NULL); - - g_test_init (&argc, &argv, NULL); - -diff --git a/tests/libtracker-common/tracker-dbus-test.c b/tests/libtracker-common/tracker-dbus-test.c -index 71e211e..197a4b2 100644 ---- a/tests/libtracker-common/tracker-dbus-test.c -+++ b/tests/libtracker-common/tracker-dbus-test.c -@@ -289,7 +289,6 @@ main (int argc, char **argv) { - gint result; - - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - /* -diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c -index 3eca76e..e4cd3bc 100644 ---- a/tests/libtracker-data/tracker-backup-test.c -+++ b/tests/libtracker-data/tracker-backup-test.c -@@ -219,10 +219,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - current_dir = g_get_current_dir (); -diff --git a/tests/libtracker-data/tracker-db-journal.c b/tests/libtracker-data/tracker-db-journal.c -index 7594e4c..1f765a2 100644 ---- a/tests/libtracker-data/tracker-db-journal.c -+++ b/tests/libtracker-data/tracker-db-journal.c -@@ -366,7 +366,6 @@ main (int argc, char **argv) - int result; - - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - #ifndef DISABLE_JOURNAL -diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c -index 376d42b..f90979c 100644 ---- a/tests/libtracker-data/tracker-ontology-change-test.c -+++ b/tests/libtracker-data/tracker-ontology-change-test.c -@@ -314,10 +314,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL); -diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c -index 1f1eddf..062d5e8 100644 ---- a/tests/libtracker-data/tracker-ontology-test.c -+++ b/tests/libtracker-data/tracker-ontology-test.c -@@ -278,10 +278,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - data_dir = g_build_filename (g_get_current_dir (), "test-cache", NULL); -diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c -index 541e377..fdb8b45 100644 ---- a/tests/libtracker-data/tracker-sparql-blank-test.c -+++ b/tests/libtracker-data/tracker-sparql-blank-test.c -@@ -127,10 +127,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - current_dir = g_get_current_dir (); -diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c -index 0f4db98..9fc1f48 100644 ---- a/tests/libtracker-data/tracker-sparql-test.c -+++ b/tests/libtracker-data/tracker-sparql-test.c -@@ -326,10 +326,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - setlocale (LC_COLLATE, "en_US.utf8"); -diff --git a/tests/libtracker-extract/tracker-test-xmp.c b/tests/libtracker-extract/tracker-test-xmp.c -index a682a16..be1f212 100644 ---- a/tests/libtracker-extract/tracker-test-xmp.c -+++ b/tests/libtracker-extract/tracker-test-xmp.c -@@ -598,7 +598,6 @@ main (int argc, - gint result; - - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_message ("Testing XMP"); -diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c -index cb1dc5b..150200e 100644 ---- a/tests/libtracker-fts/tracker-fts-test.c -+++ b/tests/libtracker-fts/tracker-fts-test.c -@@ -183,10 +183,6 @@ main (int argc, char **argv) - - g_type_init (); - -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } -- - g_test_init (&argc, &argv, NULL); - - current_dir = g_get_current_dir (); -diff --git a/tests/libtracker-fts/tracker-parser-test.c b/tests/libtracker-fts/tracker-parser-test.c -index 032cba2..a7a3001 100644 ---- a/tests/libtracker-fts/tracker-parser-test.c -+++ b/tests/libtracker-fts/tracker-parser-test.c -@@ -349,9 +349,6 @@ main (int argc, char **argv) - gint i; - - g_type_init (); -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } - g_test_init (&argc, &argv, NULL); - - /* We want the tests to properly find the stopwords dictionaries, so we -diff --git a/tests/libtracker-fts/tracker-parser.c b/tests/libtracker-fts/tracker-parser.c -index 23527c5..9877a4f 100644 ---- a/tests/libtracker-fts/tracker-parser.c -+++ b/tests/libtracker-fts/tracker-parser.c -@@ -221,9 +221,6 @@ int - main (int argc, char **argv) - { - g_type_init (); -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } - - /* Setup locale */ - setlocale (LC_ALL, ""); -diff --git a/tests/libtracker-miner/tracker-crawler-test.c b/tests/libtracker-miner/tracker-crawler-test.c -index 8a95421..59dc866 100644 ---- a/tests/libtracker-miner/tracker-crawler-test.c -+++ b/tests/libtracker-miner/tracker-crawler-test.c -@@ -320,7 +320,6 @@ main (int argc, - char **argv) - { - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_message ("Testing filesystem crawler"); -diff --git a/tests/libtracker-miner/tracker-miner-manager-test.c b/tests/libtracker-miner/tracker-miner-manager-test.c -index 517c201..e9f0278 100644 ---- a/tests/libtracker-miner/tracker-miner-manager-test.c -+++ b/tests/libtracker-miner/tracker-miner-manager-test.c -@@ -138,7 +138,6 @@ main (int argc, - gint result; - - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_message ("Testing miner manager"); -diff --git a/tests/libtracker-miner/tracker-monitor-test.c b/tests/libtracker-miner/tracker-monitor-test.c -index c3ff7f2..0a07a94 100644 ---- a/tests/libtracker-miner/tracker-monitor-test.c -+++ b/tests/libtracker-miner/tracker-monitor-test.c -@@ -1874,7 +1874,6 @@ gint - main (gint argc, - gchar **argv) - { -- g_thread_init (NULL); - g_type_init (); - g_test_init (&argc, &argv, NULL); - -diff --git a/tests/libtracker-miner/tracker-password-provider-test.c b/tests/libtracker-miner/tracker-password-provider-test.c -index 3c58b26..e365964 100644 ---- a/tests/libtracker-miner/tracker-password-provider-test.c -+++ b/tests/libtracker-miner/tracker-password-provider-test.c -@@ -106,7 +106,6 @@ main (int argc, char **argv) - - g_type_init (); - -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - /* Set test environment up */ -diff --git a/tests/libtracker-miner/tracker-priority-queue-test.c b/tests/libtracker-miner/tracker-priority-queue-test.c -index c57211c..859d7bf 100644 ---- a/tests/libtracker-miner/tracker-priority-queue-test.c -+++ b/tests/libtracker-miner/tracker-priority-queue-test.c -@@ -226,7 +226,6 @@ main (int argc, - char **argv) - { - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/libtracker-miner/tracker-priority-queue/emptiness", -diff --git a/tests/libtracker-miner/tracker-task-pool-test.c b/tests/libtracker-miner/tracker-task-pool-test.c -index 578c144..3db8af8 100644 ---- a/tests/libtracker-miner/tracker-task-pool-test.c -+++ b/tests/libtracker-miner/tracker-task-pool-test.c -@@ -161,7 +161,6 @@ gint - main (gint argc, gchar **argv) - { - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/libtracker-miner/tracker-task-pool/limit_set", -diff --git a/tests/libtracker-miner/tracker-thumbnailer-test.c b/tests/libtracker-miner/tracker-thumbnailer-test.c -index 0abd808..96e1888 100644 ---- a/tests/libtracker-miner/tracker-thumbnailer-test.c -+++ b/tests/libtracker-miner/tracker-thumbnailer-test.c -@@ -133,7 +133,6 @@ main (int argc, - char **argv) - { - g_type_init (); -- g_thread_init (NULL); - g_test_init (&argc, &argv, NULL); - - g_test_message ("Testing thumbnailer"); -diff --git a/tests/libtracker-sparql/tracker-test.c b/tests/libtracker-sparql/tracker-test.c -index 9b88a14..fd330fd 100644 ---- a/tests/libtracker-sparql/tracker-test.c -+++ b/tests/libtracker-sparql/tracker-test.c -@@ -357,7 +357,6 @@ main (gint argc, gchar **argv) - { - int result; - -- g_thread_init (NULL); - g_type_init (); - g_test_init (&argc, &argv, NULL); - -diff --git a/utils/mtp/mtp-dummy.c b/utils/mtp/mtp-dummy.c -index c03c689..686faf4 100644 ---- a/utils/mtp/mtp-dummy.c -+++ b/utils/mtp/mtp-dummy.c -@@ -530,7 +530,6 @@ check_duplicates (void) - int main (int argc, char **argv) - { - /* Initialize stuff */ -- g_thread_init (NULL); - g_type_init (); - - /* Initialize locale support! */ -diff --git a/utils/tracker-sql/tracker-sql.c b/utils/tracker-sql/tracker-sql.c -index 43eb6d4..f29cfff 100644 ---- a/utils/tracker-sql/tracker-sql.c -+++ b/utils/tracker-sql/tracker-sql.c -@@ -92,9 +92,6 @@ main (int argc, char **argv) - g_option_context_free (context); - - g_type_init (); -- if (!g_thread_supported ()) { -- g_thread_init (NULL); -- } - - if (file) { - gchar *path_in_utf8; diff --git a/tracker-libemail.patch b/tracker-libemail.patch index faf8266..1225072 100644 --- a/tracker-libemail.patch +++ b/tracker-libemail.patch @@ -1,34 +1,139 @@ -diff --git a/configure.ac b/configure.ac -index ff15e98..202a7d2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -331,6 +331,9 @@ TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm" - TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - evolution-shell-3.0 >= 3.1 - evolution-plugin-3.0 -+ libemail-utils -+ libemail-engine -+ evolution-plugin-3.0 - evolution-data-server-1.2 >= $EDS_REQUIRED - camel-1.2 >= $CAMEL_REQUIRED" +diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac +--- tracker-0.12.10/configure.ac.libemail 2012-02-15 15:59:14.000000000 +0100 ++++ tracker-0.12.10/configure.ac 2012-02-22 11:15:28.737903315 +0100 +@@ -331,51 +331,76 @@ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TR + TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm" -@@ -343,6 +346,7 @@ if test "x$have_tracker_miner_evolution" = "xyes"; then + # Check requirements for tracker-miner-evolution +-TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED +- evolution-shell-3.0 >= 3.1 +- evolution-plugin-3.0 +- evolution-data-server-1.2 >= $EDS_REQUIRED +- camel-1.2 >= $CAMEL_REQUIRED" ++evolution_plugin_name="" +-PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED], ++# First test for 3_3_5 ++TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0 >= $GLIB_REQUIRED ++ evolution-shell-3.0 >= 3.1 ++ evolution-plugin-3.0 ++ libemail-utils ++ libemail-engine ++ evolution-data-server-1.2 >= $EDS_REQUIRED ++ camel-1.2 >= $CAMEL_REQUIRED" ++ ++PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED], + [have_tracker_miner_evolution=yes], + [have_tracker_miner_evolution=no]) + +-if test "x$have_tracker_miner_evolution" = "xyes"; then ++if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then + evolution_plugin_name="evolution-plugin-3.0" + ++ AC_DEFINE(EVOLUTION_SHELL_3_3_5, 1, [Use new evolution-shell API]) AC_DEFINE(EVOLUTION_SHELL_3_2, 1, [Use new evolution-shell API]) AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API]) -+ AC_DEFINE(EVOLUTION_SHELL_3_3_5, 1, [Use new evolution-shell API]) - else - TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED - evolution-shell-3.0 -diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c -index fc9923a..15a3977 100644 ---- a/src/plugins/evolution/tracker-evolution-plugin.c -+++ b/src/plugins/evolution/tracker-evolution-plugin.c -@@ -40,27 +40,37 @@ +-else +- TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED +- evolution-shell-3.0 +- evolution-plugin-3.0 +- evolution-data-server-1.2 >= $EDS_REQUIRED +- camel-1.2 >= $CAMEL_REQUIRED" +- +- PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED], +- [have_tracker_miner_evolution=yes], +- [have_tracker_miner_evolution=no]) ++fi + +- if test "x$have_tracker_miner_evolution" = "xyes"; then +- evolution_plugin_name="evolution-plugin-3.0" ++# Second test for 3_2 ++TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0 >= $GLIB_REQUIRED ++ evolution-shell-3.0 >= 3.1 ++ evolution-plugin-3.0 ++ evolution-data-server-1.2 >= $EDS_REQUIRED ++ camel-1.2 >= $CAMEL_REQUIRED" + +- AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API]) +- else +- evolution_plugin_name="evolution-plugin" ++PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_3_2_REQUIRED], ++ [have_tracker_miner_evolution=yes], ++ [have_tracker_miner_evolution=no]) + ++if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then ++ evolution_plugin_name="evolution-plugin-3.0" + +- TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED +- evolution-shell >= $EVO_SHELL_REQUIRED +- evolution-plugin >= $EVO_REQUIRED +- evolution-data-server-1.2 >= $EDS_REQUIRED +- camel-1.2 >= $CAMEL_REQUIRED" ++ AC_DEFINE(EVOLUTION_SHELL_3_2, 1, [Use new evolution-shell API]) ++ AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API]) ++fi + +- PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED], +- [have_tracker_miner_evolution=yes], +- [have_tracker_miner_evolution=no]) ++# Third test for 2_91 ++TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0 >= $GLIB_REQUIRED ++ evolution-shell-3.0 ++ evolution-plugin-3.0 ++ evolution-data-server-1.2 >= $EDS_REQUIRED ++ camel-1.2 >= $CAMEL_REQUIRED" + +- fi ++PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_2_91_REQUIRED], ++ [have_tracker_miner_evolution=yes], ++ [have_tracker_miner_evolution=no]) ++ ++if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then ++ evolution_plugin_name="evolution-plugin-3.0" ++ AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API]) ++fi ++ ++# Fourth test others (do we really want support for anything < 3.2)? ++TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED ++ evolution-shell >= $EVO_SHELL_REQUIRED ++ evolution-plugin >= $EVO_REQUIRED ++ evolution-data-server-1.2 >= $EDS_REQUIRED ++ camel-1.2 >= $CAMEL_REQUIRED" ++ ++PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_LAST_REQUIRED], ++ [have_tracker_miner_evolution=yes], ++ [have_tracker_miner_evolution=no]) ++ ++if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then ++ evolution_plugin_name="evolution-plugin" + fi + + # Check requirements for tracker-miner-thunderbird +@@ -1173,7 +1198,6 @@ else + fi + + if test "x$have_tracker_miner_evolution" = "xyes"; then +- + AC_ARG_WITH([evolution_plugin_dir], + AS_HELP_STRING([--with-evolution-plugin-dir], + [path to Evolution plugin directory])) +diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libemail tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c +--- tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libemail 2012-02-15 11:41:48.000000000 +0100 ++++ tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c 2012-02-22 11:22:12.705892062 +0100 +@@ -18,6 +18,7 @@ + * + * Authors: + * Philip Van Hoof ++ * Martyn Russell + */ + + #include "config.h" +@@ -40,27 +41,39 @@ #include +#include ++ #include -#include @@ -36,8 +141,10 @@ index fc9923a..15a3977 100644 -#include #ifdef EVOLUTION_SHELL_3_2 ++#include #include - #endif +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ +#ifdef EVOLUTION_SHELL_3_3_5 +#include @@ -45,17 +152,19 @@ index fc9923a..15a3977 100644 +#include +#include +#include -+#else ++#else /* EVOLUTION_SHELL_3_3_5 */ +#include +#include +#include +#include #ifdef EVOLUTION_SHELL_2_91 #include - #else +-#else ++#else /* EVOLUTION_SHELL_2_91 */ #include - #endif -+#endif +-#endif ++#endif /* EVOLUTION_SHELL_2_91 */ ++#endif /* EVOLUTION_SHELL_3_3_5 */ #include #include @@ -65,15 +174,316 @@ index fc9923a..15a3977 100644 #include #include -@@ -671,7 +681,11 @@ on_folder_summary_changed (CamelFolder *folder, +@@ -587,7 +600,7 @@ message_uri_build (CamelFolder *folder, + g_free (folder_uri); + + return uri; +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + CamelURL *a_url, *url; + const gchar *path; + gchar *uri, *qry, *ppath; +@@ -620,7 +633,7 @@ message_uri_build (CamelFolder *folder, + camel_url_free (url); + + return uri; +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + } + + /* When new messages arrive to- or got deleted from the summary, called in +@@ -686,7 +699,11 @@ on_folder_summary_changed (CamelFolder const CamelFlag *cflags; gchar *full_sparql; -+ #if EDS_CHECK_VERSION(3,3,1) ++#if EDS_CHECK_VERSION(3,3,1) + linfo = camel_folder_summary_get (summary, merged->pdata[i]); -+ #else ++#else linfo = camel_folder_summary_uid (summary, merged->pdata[i]); -+ #endif ++#endif if (linfo) { uid = (gchar *) camel_message_info_uid (linfo); +@@ -792,9 +809,9 @@ on_folder_summary_changed (CamelFolder + + #ifdef EVOLUTION_SHELL_3_2 + folder_name = camel_folder_get_display_name (folder); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + folder_name = camel_folder_get_name (folder); +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + + if (folder_name && *folder_name) { + str = g_strdup_printf ("Updating E-mails for %s", +@@ -917,9 +934,9 @@ introduce_walk_folders_in_folder (Tracke + + #ifdef EVOLUTION_SHELL_3_2 + status = g_strdup_printf ("Processing folder %s", iter->display_name); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + status = g_strdup_printf ("Processing folder %s", iter->name); +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + g_object_set (self, "progress", 0.01, "status", status, NULL); + + ret = sqlite3_prepare_v2 (cdb_r->db, query, -1, &stmt, NULL); +@@ -1302,11 +1319,11 @@ get_last_deleted_time (TrackerMinerEvolu + if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), + #ifdef EVOLUTION_SHELL_3_2 + account->uid))) { +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + uri, + CAMEL_PROVIDER_STORE, + NULL))) { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + continue; + } + +@@ -1347,13 +1364,13 @@ register_on_get_folder (GObject *so + gpointer user_data) + { + CamelFolder *folder = camel_store_get_folder_finish (CAMEL_STORE (source_object), res, NULL); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + static void + register_on_get_folder (gchar *uri, + CamelFolder *folder, + gpointer user_data) + { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + GetFolderInfo *info = user_data; + gchar *account_uri = info->account_uri; + CamelFolderInfo *iter = info->iter; +@@ -1436,17 +1453,17 @@ register_walk_folders_in_folder (Tracker + NULL, + register_on_get_folder, + info); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + mail_get_folder ( + #ifdef EVOLUTION_SHELL_2_91 + session, +-#endif ++#endif /* EVOLUTION_SHELL_2_91 */ + iter->uri, + 0, + register_on_get_folder, + info, + mail_msg_unordered_push); +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + + if (iter->child) { + register_walk_folders_in_folder (self, iter->child, +@@ -1465,13 +1482,13 @@ unregister_on_get_folder (GObject * + gpointer user_data) + { + CamelFolder *folder = camel_store_get_folder_finish (CAMEL_STORE (source_object), res, NULL); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + static void + unregister_on_get_folder (gchar *uri, + CamelFolder *folder, + gpointer user_data) + { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + GetFolderInfo *info = user_data; + CamelFolderInfo *titer = info->iter; + TrackerMinerEvolution *self = info->self; +@@ -1533,17 +1550,17 @@ unregister_walk_folders_in_folder (Track + NULL, + unregister_on_get_folder, + info); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + mail_get_folder ( + #ifdef EVOLUTION_SHELL_2_91 + session, +-#endif ++#endif /* EVOLUTION_SHELL_2_91 */ + titer->uri, + 0, + unregister_on_get_folder, + info, + mail_msg_unordered_push); +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + + if (titer->child) { + unregister_walk_folders_in_folder (self, titer->child, +@@ -1643,13 +1660,13 @@ on_got_folderinfo_introduce (GObject + { + CamelStore *store = CAMEL_STORE (source_object); + CamelFolderInfo *iter = camel_store_get_folder_info_finish (store, res, NULL); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + static gboolean + on_got_folderinfo_introduce (CamelStore *store, + CamelFolderInfo *iter, + void *data) + { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + TryAgainInfo *info = g_new0 (TryAgainInfo, 1); + + /* Ownership of these is transfered in try_again */ +@@ -1688,9 +1705,9 @@ on_got_folderinfo_introduce (CamelStore + + #ifdef EVOLUTION_SHELL_3_2 + camel_store_free_folder_info (store, iter); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + return TRUE; +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + } + + static void +@@ -1716,11 +1733,11 @@ introduce_account_to (TrackerMinerEvolut + if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), + #ifdef EVOLUTION_SHELL_3_2 + account->uid))) { +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + uri, + CAMEL_PROVIDER_STORE, + NULL))) { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + return; + } + +@@ -1749,11 +1766,13 @@ introduce_account_to (TrackerMinerEvolut + NULL, + on_got_folderinfo_introduce, + intro_info); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + mail_get_folderinfo (store, NULL, on_got_folderinfo_introduce, intro_info); +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + ++#ifndef EVOLUTION_SHELL_3_2 + g_object_unref (store); ++#endif /* EVOLUTION_SHELL_3_2 */ + + } + +@@ -1960,13 +1979,13 @@ on_got_folderinfo_register (GObject + { + CamelStore *store = CAMEL_STORE (source_object); + CamelFolderInfo *iter = camel_store_get_folder_info_finish (store, res, NULL); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + static gboolean + on_got_folderinfo_register (CamelStore *store, + CamelFolderInfo *iter, + void *data) + { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + RegisterInfo *reg_info = data; + TrackerMinerEvolution *self = reg_info->self; + TrackerMinerEvolutionPrivate *priv; +@@ -2025,9 +2044,9 @@ on_got_folderinfo_register (CamelStore + + #ifdef EVOLUTION_SHELL_3_2 + camel_store_free_folder_info (store, iter); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + return TRUE; +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + } + + static void +@@ -2054,11 +2073,11 @@ register_account (TrackerMinerEvolution + if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), + #ifdef EVOLUTION_SHELL_3_2 + account->uid))) { +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + uri, + CAMEL_PROVIDER_STORE, + NULL))) { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + return; + } + +@@ -2085,7 +2104,9 @@ register_account (TrackerMinerEvolution + mail_get_folderinfo (store, NULL, on_got_folderinfo_register, reg_info); + #endif + ++#ifndef EVOLUTION_SHELL_3_2 + g_object_unref (store); ++#endif + } + + #ifdef EVOLUTION_SHELL_3_2 +@@ -2096,13 +2117,13 @@ on_got_folderinfo_unregister (GObject + { + CamelStore *store = CAMEL_STORE (source_object); + CamelFolderInfo *titer = camel_store_get_folder_info_finish (store, res, NULL); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + static gboolean + on_got_folderinfo_unregister (CamelStore *store, + CamelFolderInfo *titer, + void *data) + { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + RegisterInfo *reg_info = data; + TrackerMinerEvolution *self = reg_info->self; + TrackerMinerEvolutionPrivate *priv; +@@ -2128,9 +2149,9 @@ on_got_folderinfo_unregister (CamelStore + + #ifdef EVOLUTION_SHELL_3_2 + camel_store_free_folder_info (store, titer); +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + return TRUE; +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + } + + static void +@@ -2152,11 +2173,11 @@ unregister_account (TrackerMinerEvolutio + if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), + #ifdef EVOLUTION_SHELL_3_2 + account->uid))) { +-#else ++#else /* EVOLUTION_SHELL_3_2 */ + uri, + CAMEL_PROVIDER_STORE, + NULL))) { +-#endif ++#endif /* EVOLUTION_SHELL_3_2 */ + return; + } + +@@ -2181,7 +2202,9 @@ unregister_account (TrackerMinerEvolutio + mail_get_folderinfo (store, NULL, on_got_folderinfo_unregister, reg_info); + #endif + ++#ifndef EVOLUTION_SHELL_3_2 + g_object_unref (store); ++#endif + } + + static void +@@ -2420,7 +2443,7 @@ tracker_miner_evolution_init (TrackerMin + shell_backend = e_shell_get_backend_by_name (shell, "mail"); + session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend)); + } +-#endif ++#endif /* EVOLUTION_SHELL_2_91 */ + + priv->sparql_cancel = g_cancellable_new (); + diff --git a/tracker.spec b/tracker.spec index b697dec..fc916b8 100644 --- a/tracker.spec +++ b/tracker.spec @@ -1,7 +1,7 @@ Summary: Desktop-neutral search tool and indexer Name: tracker -Version: 0.12.9 -Release: 2%{?dist} +Version: 0.12.10 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/tracker/ @@ -9,7 +9,6 @@ Source0: http://download.gnome.org/sources/tracker/0.12/%{name}-%{version}.tar.x Patch0: tracker-fixdso.patch Patch1: tracker-extract-pdf-crash-fix.patch Patch2: tracker-libemail.patch -Patch3: tracker-g-thread-init.patch BuildRequires: poppler-glib-devel evolution-devel libxml2-devel libgsf-devel BuildRequires: libuuid-devel dbus-glib-devel @@ -95,7 +94,6 @@ This package contains the documentation for tracker %patch0 -p0 -b .fixdso %patch1 -p0 %patch2 -p1 -b .libemail -%patch3 -p1 -b .g-thread-init %global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir) @@ -214,6 +212,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %{_datadir}/gtk-doc/html/ontology/ %changelog +* Wed Feb 22 2012 Milan Crha - 0.12.10-1 +- Update to 0.12.10 +- Remove patch to remove g_thread_init() calls (fixed upstream) + * Wed Feb 08 2012 Milan Crha - 0.12.9-2 - Rebuild against newer evolution-data-server - Add patch to build with evolution-3.3.5's libemail