pool/tracker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a9f70c7b82
tracker/tracker-g_thread.patch

564 lines
20 KiB
Diff
Raw Blame History

From 9295f5952a5d1a8ae8c461adef7e36caee01c676 Mon Sep 17 00:00:00 2001
From: Jürg Billeter <j@bitron.ch>
Date: Sun, 27 Nov 2011 14:10:21 +0000
Subject: 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.
---
Index: tracker-0.12.8/configure.ac
===================================================================
--- tracker-0.12.8.orig/configure.ac
+++ tracker-0.12.8/configure.ac
@@ -246,7 +246,6 @@ PKG_CHECK_MODULES(LIBTRACKER_EXTRACT, [$
# 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, [$L
# 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, [$TRA
# 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, [$TRA
# 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
# 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_MODULE
# 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, [$T
# 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_MINE
# 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, [$TRAC
# 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, [
# 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
Index: tracker-0.12.8/examples/libtracker-miner/tracker-main.c
===================================================================
--- tracker-0.12.8.orig/examples/libtracker-miner/tracker-main.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/src/miners/fs/tracker-main.c
===================================================================
--- tracker-0.12.8.orig/src/miners/fs/tracker-main.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/src/miners/rss/tracker-main.c
===================================================================
--- tracker-0.12.8.orig/src/miners/rss/tracker-main.c
+++ tracker-0.12.8/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, "");
Index: tracker-0.12.8/src/tracker-control/tracker-control.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-control/tracker-control.c
+++ tracker-0.12.8/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]... <THIS_MESSAGE> */
context = g_option_context_new (_(" - Manage Tracker processes and data"));
Index: tracker-0.12.8/src/tracker-utils/tracker-import.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-import.c
+++ tracker-0.12.8/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) {
Index: tracker-0.12.8/src/tracker-utils/tracker-info.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-info.c
+++ tracker-0.12.8/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) {
Index: tracker-0.12.8/src/tracker-utils/tracker-search.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-search.c
+++ tracker-0.12.8/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 */
Index: tracker-0.12.8/src/tracker-utils/tracker-sparql.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-sparql.c
+++ tracker-0.12.8/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) {
Index: tracker-0.12.8/src/tracker-utils/tracker-stats.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-stats.c
+++ tracker-0.12.8/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) {
Index: tracker-0.12.8/src/tracker-utils/tracker-tag.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-utils/tracker-tag.c
+++ tracker-0.12.8/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) {
Index: tracker-0.12.8/src/tracker-writeback/tracker-main.c
===================================================================
--- tracker-0.12.8.orig/src/tracker-writeback/tracker-main.c
+++ tracker-0.12.8/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 */
Index: tracker-0.12.8/tests/gvdb/gvdb-test.c
===================================================================
--- tracker-0.12.8.orig/tests/gvdb/gvdb-test.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/tests/libtracker-common/tracker-dbus-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-common/tracker-dbus-test.c
+++ tracker-0.12.8/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);
/*
Index: tracker-0.12.8/tests/libtracker-data/tracker-backup-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-backup-test.c
+++ tracker-0.12.8/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 ();
Index: tracker-0.12.8/tests/libtracker-data/tracker-db-journal.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-db-journal.c
+++ tracker-0.12.8/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
Index: tracker-0.12.8/tests/libtracker-data/tracker-ontology-change-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-ontology-change-test.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/tests/libtracker-data/tracker-ontology-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-ontology-test.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/tests/libtracker-data/tracker-sparql-blank-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-sparql-blank-test.c
+++ tracker-0.12.8/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 ();
Index: tracker-0.12.8/tests/libtracker-data/tracker-sparql-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-data/tracker-sparql-test.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/tests/libtracker-extract/tracker-test-xmp.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-extract/tracker-test-xmp.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/tests/libtracker-fts/tracker-fts-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-fts-test.c
+++ tracker-0.12.8/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 ();
Index: tracker-0.12.8/tests/libtracker-fts/tracker-parser-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-parser-test.c
+++ tracker-0.12.8/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
Index: tracker-0.12.8/tests/libtracker-fts/tracker-parser.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-fts/tracker-parser.c
+++ tracker-0.12.8/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, "");
Index: tracker-0.12.8/tests/libtracker-miner/tracker-crawler-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-crawler-test.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/tests/libtracker-miner/tracker-miner-manager-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-miner-manager-test.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/tests/libtracker-miner/tracker-monitor-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-monitor-test.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/tests/libtracker-miner/tracker-password-provider-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-password-provider-test.c
+++ tracker-0.12.8/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 */
Index: tracker-0.12.8/tests/libtracker-miner/tracker-priority-queue-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-priority-queue-test.c
+++ tracker-0.12.8/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",
Index: tracker-0.12.8/tests/libtracker-miner/tracker-task-pool-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-task-pool-test.c
+++ tracker-0.12.8/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",
Index: tracker-0.12.8/tests/libtracker-miner/tracker-thumbnailer-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-miner/tracker-thumbnailer-test.c
+++ tracker-0.12.8/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");
Index: tracker-0.12.8/tests/libtracker-sparql/tracker-test.c
===================================================================
--- tracker-0.12.8.orig/tests/libtracker-sparql/tracker-test.c
+++ tracker-0.12.8/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);
Index: tracker-0.12.8/utils/mtp/mtp-dummy.c
===================================================================
--- tracker-0.12.8.orig/utils/mtp/mtp-dummy.c
+++ tracker-0.12.8/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! */
Index: tracker-0.12.8/utils/tracker-sql/tracker-sql.c
===================================================================
--- tracker-0.12.8.orig/utils/tracker-sql/tracker-sql.c
+++ tracker-0.12.8/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;
Index: tracker-0.12.8/src/miners/flickr/tracker-miner-flickr.c
===================================================================
--- tracker-0.12.8.orig/src/miners/flickr/tracker-miner-flickr.c
+++ tracker-0.12.8/src/miners/flickr/tracker-miner-flickr.c
@@ -6648,8 +6648,6 @@ gint tracker_miner_flickr_main (gchar**
int main (int argc, char ** argv) {
#line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
- g_thread_init (NULL);
-#line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
g_type_init ();
#line 950 "/home/martyn/Source/tracker/src/miners/flickr/tracker-miner-flickr.vala"
return tracker_miner_flickr_main (argv, argc);
Reference in New Issue View Git Blame Copy Permalink