From 23c385766711e5294957d3b61ae6e5af1c7ec417 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 26 Sep 2011 16:23:51 -0700 Subject: [PATCH] Require Tracker 0.12 Closes: bgo#660051 - require tracker 0.12 --- NEWS | 1 + configure.ac | 13 +++---------- tests/lib/tracker/Makefile.am | 5 ----- tests/lib/tracker/backend.vala | 2 -- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/NEWS b/NEWS index f129533..79debba 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ Overview of changes from libfolks 0.6.3.1 to libfolks 0.6.4 * Bug 660140 — contacts_contact_find_persona_from_store: assertion `store != NULL' failed * Bug 659041 — tpf-persona-store.vala: try to connect to a NULL object +* Bug 660051 — require tracker 0.12 Overview of changes from libfolks 0.6.3 to libfolks 0.6.3.1 =========================================================== diff --git a/configure.ac b/configure.ac index 9227586..66d8f00 100644 --- a/configure.ac +++ b/configure.ac @@ -130,8 +130,8 @@ GLIB_REQUIRED=2.24.0 TP_GLIB_REQUIRED=0.13.1 VALA_REQUIRED=0.13.4 VALADOC_REQUIRED=0.3.1 -TRACKER_SPARQL_REQUIRED=0.10 -TRACKER_SPARQL_NEWER_VER=0.10.6 +TRACKER_SPARQL_REQUIRED=0.12 +TRACKER_SPARQL_NEWER_VER=0.12.0 GCONF2_REQUIRED=2.31 EBOOK_REQUIRED=3.1.5 EDATASERVER_REQUIRED=3.1.5 @@ -153,14 +153,7 @@ if test x$enable_tracker_backend = xyes; then # when calling Tracker.Sparql.Connection.get (). So we need to test # for the installed version and catch or not the exception, accordingly. PKG_CHECK_MODULES([TRACKER_SPARQL], - [tracker-sparql-0.10 >= $TRACKER_SPARQL_NEWER_VER], - [AM_CONDITIONAL(HAVE_NEW_TRACKER, [ test 1 == 1 ])], - [PKG_CHECK_MODULES([TRACKER_SPARQL], - [tracker-sparql-0.10 >= $TRACKER_SPARQL_REQUIRED], - [AM_CONDITIONAL(HAVE_NEW_TRACKER, [ test 0 == 1 ])])] - ) -else - AM_CONDITIONAL(HAVE_NEW_TRACKER, [ test 0 == 1 ]) + [tracker-sparql-0.12 >= $TRACKER_SPARQL_NEWER_VER]) fi if test x$enable_eds_backend = xyes; then diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am index f1cd8d1..33e31ea 100644 --- a/tests/lib/tracker/Makefile.am +++ b/tests/lib/tracker/Makefile.am @@ -1,7 +1,3 @@ -if HAVE_NEW_TRACKER -TRACKER_VER_CONSTANTS = -D USE_NEW_SPAWN_EXCEPTION -endif - VALAFLAGS += \ $(ERROR_VALAFLAGS) \ --library=tracker-test \ @@ -16,7 +12,6 @@ VALAFLAGS += \ --pkg tracker-sparql-0.10 \ --pkg folks-tracker \ -g \ - $(TRACKER_VER_CONSTANTS) \ $(NULL) noinst_LTLIBRARIES = libtracker-test.la diff --git a/tests/lib/tracker/backend.vala b/tests/lib/tracker/backend.vala index f411ed2..942052e 100644 --- a/tests/lib/tracker/backend.vala +++ b/tests/lib/tracker/backend.vala @@ -255,13 +255,11 @@ public class TrackerTest.Backend throw new BackendSetupError.ADD_CONTACT_FAILED ("Error fetching SPARQL connection handler : %s\n", e3.message); } -#if USE_NEW_SPAWN_EXCEPTION catch (GLib.SpawnError e4) { throw new BackendSetupError.ADD_CONTACT_FAILED ("Error fetching SPARQL connection handler : %s\n", e4.message); } -#endif } private void _add_contacts () throws BackendSetupError -- 2.7.4