After talking to saleem on IRC, I cleaned up the patches even further, split them up more logically and made them against current SVN head. The patches should be applied in the given order
1.) 01-remove_mysql.patch: Corresponds to saleem's tracker-0.5.3-remove-mysql.patch, which removes the mysql support. You should also run: svn del data/mysql-*.sql src/trackerd/tracker-db-mysql.* 2.) 02-remove_using_sqlite.patch As sqlite is now the only db backend, there is no need for the USING_SQLITE define. So let's remove it. Simpler is better ;-) 3.) 03-external_sqlite_fixes.patch A reworked patch with ideas from saleem, which fixes and simplifies the usage of the external system sqlite. 4.) 04-general_build_cleanups.patch General cleanups, like update of the homepage address, replacing of deprecrecated autoconf macros and removal of unused includes. Please review and apply, Michael
From 5509b556a54769ef1e1ca8a2f3ac15117ae13dc4 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 11 Jan 2007 03:00:39 +0100 Subject: [PATCH] Mysql removal --- data/Makefile.am | 5 +---- src/trackerd/Makefile.am | 1 - src/trackerd/tracker-db.h | 2 -- src/trackerd/tracker-email-evolution.h | 2 -- src/trackerd/tracker-email-kmail.h | 2 -- src/trackerd/tracker-email-thunderbird.h | 2 -- src/trackerd/tracker-email.h | 2 -- 7 files changed, 1 insertions(+), 15 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 6dfbd47..4a4e83c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,11 +3,8 @@ SUBDIRS = languages configdir = $(datadir)/tracker config_DATA = tracker-introspect.xml \ - mysql-tracker.sql \ sqlite-tracker.sql \ - mysql-stored-procs.sql \ - sqlite-stored-procs.sql \ - mysql-system.sql + sqlite-stored-procs.sql servicedir = $(prefix)/share/dbus-1/services service_in_files = tracker.service.in diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am index 02e91cb..2340336 100644 --- a/src/trackerd/Makefile.am +++ b/src/trackerd/Makefile.am @@ -150,7 +150,6 @@ trackerd_LDADD = \ $(GLIB2_LIBS) \ $(FAM_LIBS) \ $(DBUS_LIBS) \ - $(MYSQL_LIBS) \ $(PANGO_LIBS) \ $(GMIME_LIBS) \ $(additional_libs) \ diff --git a/src/trackerd/tracker-db.h b/src/trackerd/tracker-db.h index 641d77c..cd31f31 100644 --- a/src/trackerd/tracker-db.h +++ b/src/trackerd/tracker-db.h @@ -30,8 +30,6 @@ #ifdef USING_SQLITE #include "tracker-db-sqlite.h" -#else -#include "tracker-db-mysql.h" #endif gboolean tracker_db_is_file_up_to_date (DBConnection *db_con, const char *uri, guint32 *id); diff --git a/src/trackerd/tracker-email-evolution.h b/src/trackerd/tracker-email-evolution.h index 1501d14..7e02ee4 100644 --- a/src/trackerd/tracker-email-evolution.h +++ b/src/trackerd/tracker-email-evolution.h @@ -28,8 +28,6 @@ #ifdef USING_SQLITE # include "tracker-db-sqlite.h" -#else -# include "tracker-db-mysql.h" #endif diff --git a/src/trackerd/tracker-email-kmail.h b/src/trackerd/tracker-email-kmail.h index aafcded..7ad80c2 100644 --- a/src/trackerd/tracker-email-kmail.h +++ b/src/trackerd/tracker-email-kmail.h @@ -28,8 +28,6 @@ #ifdef USING_SQLITE # include "tracker-db-sqlite.h" -#else -# include "tracker-db-mysql.h" #endif diff --git a/src/trackerd/tracker-email-thunderbird.h b/src/trackerd/tracker-email-thunderbird.h index c94eed7..eb43571 100644 --- a/src/trackerd/tracker-email-thunderbird.h +++ b/src/trackerd/tracker-email-thunderbird.h @@ -30,8 +30,6 @@ #ifdef USING_SQLITE # include "tracker-db-sqlite.h" -#else -# include "tracker-db-mysql.h" #endif diff --git a/src/trackerd/tracker-email.h b/src/trackerd/tracker-email.h index 1f61c6e..0385d66 100644 --- a/src/trackerd/tracker-email.h +++ b/src/trackerd/tracker-email.h @@ -27,8 +27,6 @@ #ifdef USING_SQLITE # include "tracker-db-sqlite.h" -#else -# include "tracker-db-mysql.h" #endif void tracker_email_watch_emails (DBConnection *db_con); -- 1.4.4.3
From 83e0fff02782b0cc04c03004987114628a3090d2 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 11 Jan 2007 03:09:00 +0100 Subject: [PATCH] Remove USING_SQLITE --- configure.in | 6 ++---- src/trackerd/tracker-db.h | 2 -- src/trackerd/tracker-email-evolution.h | 4 +--- src/trackerd/tracker-email-kmail.h | 4 +--- src/trackerd/tracker-email-thunderbird.h | 4 +--- src/trackerd/tracker-email.h | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index c857c81..8917882 100644 --- a/configure.in +++ b/configure.in @@ -215,13 +215,10 @@ fi #################################################################### -# Optional database/indexer component checks +# External SQLite check #################################################################### - SQLITE_REQUIRED=3.2 -AC_DEFINE(USING_SQLITE, [], [Define if we are using sqlite]) -AM_CONDITIONAL(USING_SQLITE, true) AC_ARG_ENABLE(external_sqlite, AC_HELP_STRING( @@ -241,6 +238,7 @@ else AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false) fi + ############################################################################### # Check for file monitor backends ############################################################################### diff --git a/src/trackerd/tracker-db.h b/src/trackerd/tracker-db.h index cd31f31..b178377 100644 --- a/src/trackerd/tracker-db.h +++ b/src/trackerd/tracker-db.h @@ -28,9 +28,7 @@ #include "config.h" -#ifdef USING_SQLITE #include "tracker-db-sqlite.h" -#endif gboolean tracker_db_is_file_up_to_date (DBConnection *db_con, const char *uri, guint32 *id); FileInfo * tracker_db_get_file_info (DBConnection *db_con, FileInfo *info); diff --git a/src/trackerd/tracker-email-evolution.h b/src/trackerd/tracker-email-evolution.h index 7e02ee4..b1088ef 100644 --- a/src/trackerd/tracker-email-evolution.h +++ b/src/trackerd/tracker-email-evolution.h @@ -26,9 +26,7 @@ #include "config.h" -#ifdef USING_SQLITE -# include "tracker-db-sqlite.h" -#endif +#include "tracker-db-sqlite.h" /* diff --git a/src/trackerd/tracker-email-kmail.h b/src/trackerd/tracker-email-kmail.h index 7ad80c2..eff0be6 100644 --- a/src/trackerd/tracker-email-kmail.h +++ b/src/trackerd/tracker-email-kmail.h @@ -26,9 +26,7 @@ #include "config.h" -#ifdef USING_SQLITE -# include "tracker-db-sqlite.h" -#endif +#include "tracker-db-sqlite.h" /* diff --git a/src/trackerd/tracker-email-thunderbird.h b/src/trackerd/tracker-email-thunderbird.h index eb43571..95949fd 100644 --- a/src/trackerd/tracker-email-thunderbird.h +++ b/src/trackerd/tracker-email-thunderbird.h @@ -28,9 +28,7 @@ #include "config.h" -#ifdef USING_SQLITE -# include "tracker-db-sqlite.h" -#endif +#include "tracker-db-sqlite.h" /* diff --git a/src/trackerd/tracker-email.h b/src/trackerd/tracker-email.h index 0385d66..448bd19 100644 --- a/src/trackerd/tracker-email.h +++ b/src/trackerd/tracker-email.h @@ -25,9 +25,7 @@ #include "config.h" -#ifdef USING_SQLITE -# include "tracker-db-sqlite.h" -#endif +#include "tracker-db-sqlite.h" void tracker_email_watch_emails (DBConnection *db_con); void tracker_email_end_email_watching (void); -- 1.4.4.3
From 34006b183b306e16f4b795fa84af0fd7a295f2df Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 11 Jan 2007 03:20:32 +0100 Subject: [PATCH] external sqlite fixes --- configure.in | 12 ++++++------ src/trackerd/Makefile.am | 13 ++----------- src/trackerd/tracker-db-sqlite.h | 2 +- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/configure.in b/configure.in index 8917882..1622f1e 100644 --- a/configure.in +++ b/configure.in @@ -226,18 +226,18 @@ AC_ARG_ENABLE(external_sqlite, [build using system's sqlite which must be a threadsafe version]),, [enable_external_sqlite=no]) -if test "x$enable_external_sqlite" = "xyes"; -then - - # Check for SQLite3 +if test "x$enable_external_sqlite" = "xyes"; then PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ]) - AC_SUBST(SQLITE3_CFLAGS) - AC_SUBST(SQLITE3_LIBS) AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true) else + SQLITE3_CFLAGS="-I\$(top_srcdir)/src/sqlite3" + SQLITE3_LIBS="\$(top_srcdir)/src/sqlite3/libsqlite-private.la" AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false) fi +AC_SUBST(SQLITE3_CFLAGS) +AC_SUBST(SQLITE3_LIBS) + ############################################################################### # Check for file monitor backends diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am index 2340336..7560f5b 100644 --- a/src/trackerd/Makefile.am +++ b/src/trackerd/Makefile.am @@ -1,12 +1,3 @@ -if USING_EXTERNAL_SQLITE -additional_flags= $(SQLITE3_CFLAGS) -additional_libs= $(SQLITE3_LIBS) -else -additional_flags= -I$(top_builddir)/src/sqlite3 -additional_libs= $(top_builddir)/src/sqlite3/libsqlite-private.la -endif - - INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ @@ -24,7 +15,7 @@ INCLUDES = \ $(GMIME_CFLAGS) \ $(FAM_CFLAGS) \ $(DBUS_CFLAGS) \ - $(additional_flags) \ + $(SQLITE3_CFLAGS) \ -I$(top_builddir)/src/libstemmer @@ -152,7 +143,7 @@ trackerd_LDADD = \ $(DBUS_LIBS) \ $(PANGO_LIBS) \ $(GMIME_LIBS) \ - $(additional_libs) \ + $(SQLITE3_LIBS) \ $(GTHREAD_LIBS) \ -lz \ $(top_builddir)/src/libstemmer/libstemmer-private.la diff --git a/src/trackerd/tracker-db-sqlite.h b/src/trackerd/tracker-db-sqlite.h index d462d1a..66772c9 100644 --- a/src/trackerd/tracker-db-sqlite.h +++ b/src/trackerd/tracker-db-sqlite.h @@ -22,7 +22,7 @@ #ifndef _TRACKER_SQLITE_DB_H_ #define _TRACKER_SQLITE_DB_H_ -#include "../sqlite3/sqlite3.h" +#include <sqlite3.h> #include <glib.h> #include "tracker-utils.h" -- 1.4.4.3
From 6e9bf716706d953a71da47c714f9a636ee653645 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[EMAIL PROTECTED]> Date: Thu, 11 Jan 2007 03:25:05 +0100 Subject: [PATCH] Cleanups --- configure.in | 8 ++++---- src/trackerd/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 1622f1e..61dcb16 100644 --- a/configure.in +++ b/configure.in @@ -8,9 +8,7 @@ AC_INIT([tracker],[0.5.3],[EMAIL PROTECTED]) AC_CONFIG_SRCDIR([src/trackerd/trackerd.c]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AC_SUBST(PACKAGE_URL, [http://www.gnome.org/~jamiemcc/tracker/]) - -AM_CONFIG_HEADER(config.h) +AC_SUBST(PACKAGE_URL, [http://www.tracker-project.org]) CFLAGS="$CFLAGS" @@ -18,7 +16,7 @@ CFLAGS="$CFLAGS" AC_PROG_CC AC_HEADER_STDC -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL # Checks for header files. AC_HEADER_STDC @@ -512,6 +510,8 @@ AC_CONFIG_FILES([ po/Makefile.in ]) +AC_CONFIG_HEADERS([config.h]) + AC_OUTPUT echo " diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am index 21f0181..8d2ac60 100644 --- a/src/trackerd/Makefile.am +++ b/src/trackerd/Makefile.am @@ -15,8 +15,7 @@ INCLUDES = \ $(GMIME_CFLAGS) \ $(FAM_CFLAGS) \ $(DBUS_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - -I$(top_builddir)/src/libstemmer + $(SQLITE3_CFLAGS) if HAVE_INOTIFY -- 1.4.4.3
_______________________________________________ tracker-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/tracker-list
