pool/tracker
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 47086 from GNOME:Apps

Browse Source 
Copy from GNOME:Apps/tracker based on submit request 47086 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/47086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=7
This commit is contained in:
OBS User autobuild 2010-09-06 15:49:08 +00:00 committed by Git OBS Bridge
parent c1e62a6cd3
commit 95d727116e
6 changed files with 155 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tracker-0.9.16.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71afb2171cc1d907527efbf4549f1d2ae0a7466913987d2d23ca2fe82ac3b372
size 5498313

3
tracker-0.9.19.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0411e1cb4f9a611205b606535bb49bf7bb1f5f9dba9381641f9fc68b94cab535
size 7245962

355
tracker-fix-new-evo.patch
View File

@ -1,355 +0,0 @@
Index: tracker-0.9.14/configure.ac
===================================================================
--- tracker-0.9.14.orig/configure.ac
+++ tracker-0.9.14/configure.ac
@@ -911,6 +911,8 @@ if test "x$enable_miner_evolution" != "x
PKG_CHECK_EXISTS([evolution-data-server-1.2 >= 2.29.1],
[AC_DEFINE(HAVE_EDS_2_29_1, 1, [Define if we have eds 2.29.1 or newer])])
+ PKG_CHECK_EXISTS([evolution-data-server-1.2 >= 2.31.2],
+ [AC_DEFINE(HAVE_EDS_2_31_2, 1, [Define if we have eds 2.31.2 or newer])])
AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
AC_SUBST(EVOLUTION_PLUGIN_LIBS)
Index: tracker-0.9.14/src/plugins/evolution/tracker-evolution-plugin.c
===================================================================
--- tracker-0.9.14.orig/src/plugins/evolution/tracker-evolution-plugin.c
+++ tracker-0.9.14/src/plugins/evolution/tracker-evolution-plugin.c
@@ -34,32 +34,13 @@
#include <time.h>
#include <inttypes.h>
+#include <glib/gi18n-lib.h>
#include <glib-object.h>
#include <gio/gio.h>
#include <sqlite3.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-i18n.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-db.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-smime-context.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-windows.h>
+#include <camel/camel.h>
#include <mail/mail-config.h>
#include <mail/mail-session.h>
@@ -303,8 +284,16 @@ get_email_and_fullname (const gchar *lin
static void
folder_registry_free (FolderRegistry *registry)
{
+#ifdef HAVE_EDS_2_31_2
+ g_signal_handler_disconnect (registry->folder, registry->hook_info->hook_id);
+#else
camel_object_remove_event (registry->folder, registry->hook_info->hook_id);
+#endif
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (registry->folder);
+#else
camel_object_unref (registry->folder);
+#endif
g_free (registry->hook_info->account_uri);
g_slice_free (OnSummaryChangedInfo, registry->hook_info);
g_slice_free (FolderRegistry, registry);
@@ -321,7 +310,11 @@ folder_registry_new (const gchar *accoun
registry->hook_info->account_uri = g_strdup (account_uri);
registry->hook_info->self = self; /* weak */
registry->hook_info->hook_id = 0;
+#ifdef HAVE_EDS_2_31_2
+ g_object_ref (folder);
+#else
camel_object_ref (folder);
+#endif
registry->folder = folder;
return registry;
@@ -1267,7 +1260,6 @@ get_last_deleted_time (TrackerEvolutionP
EAccount *account = (EAccount *) e_iterator_get (it);
CamelProvider *provider;
CamelStore *store;
- CamelException ex;
char *uri;
CamelDB *cdb_r;
sqlite3_stmt *stmt = NULL;
@@ -1275,13 +1267,10 @@ get_last_deleted_time (TrackerEvolutionP
guint ret = SQLITE_OK;
guint64 latest = smallest;
- camel_exception_init (&ex);
-
if (!account->enabled || !(uri = account->source->url))
continue;
if (!(provider = camel_provider_get(uri, NULL))) {
- camel_exception_clear (&ex);
continue;
}
@@ -1289,8 +1278,7 @@ get_last_deleted_time (TrackerEvolutionP
continue;
}
- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
- camel_exception_clear (&ex);
+ if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
continue;
}
@@ -1345,9 +1333,15 @@ register_on_get_folder (gchar *uri, Came
goto not_ready;
}
+#ifdef HAVE_EDS_2_31_2
+ hook_id = g_signal_connect (folder, "changed",
+ G_CALLBACK (on_folder_summary_changed),
+ registry->hook_info);
+#else
hook_id = camel_object_hook_event (folder, "folder_changed",
CAMEL_CALLBACK (on_folder_summary_changed),
registry->hook_info);
+#endif
registry->hook_info->hook_id = hook_id;
g_hash_table_replace (priv->registered_folders,
@@ -1524,7 +1518,11 @@ free_worker_thread_info (gpointer data,
/* Ownership was transfered to us in try_again */
free_introduction_info (winfo->intro_info);
camel_db_close (winfo->cdb_r);
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (winfo->store);
+#else
camel_object_unref (winfo->store);
+#endif
camel_folder_info_free (winfo->iter);
g_free (winfo);
}
@@ -1579,7 +1577,11 @@ on_got_folderinfo_introduce (CamelStore
/* Ownership of these is transfered in try_again */
+#ifdef HAVE_EDS_2_31_2
+ g_object_ref (store);
+#else
camel_object_ref (store);
+#endif
info->store = store;
/* This apparently creates a thread */
info->cdb_r = camel_db_clone (store->cdb_r, NULL);
@@ -1622,24 +1624,20 @@ introduce_account_to (TrackerEvolutionPl
{
CamelProvider *provider;
CamelStore *store;
- CamelException ex;
char *uri, *account_uri, *ptr;
IntroductionInfo *intro_info;
if (!account->enabled || !(uri = account->source->url))
return;
- camel_exception_init (&ex);
- if (!(provider = camel_provider_get(uri, &ex))) {
- camel_exception_clear (&ex);
+ if (!(provider = camel_provider_get(uri, NULL))) {
return;
}
if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
return;
- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
- camel_exception_clear (&ex);
+ if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
return;
}
@@ -1660,7 +1658,11 @@ introduce_account_to (TrackerEvolutionPl
mail_get_folderinfo (store, NULL, on_got_folderinfo_introduce, intro_info);
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (store);
+#else
camel_object_unref (store);
+#endif
}
@@ -1821,7 +1823,11 @@ on_folder_deleted (CamelStore *store,
static void
on_folder_renamed (CamelStore *store,
+#ifdef HAVE_EDS_2_31_2
+ gchar *old_name,
+#else
CamelRenameInfo *info,
+#endif
StoreRegistry *registry)
{
unregister_account (registry->self, registry->account);
@@ -1839,7 +1845,11 @@ store_registry_new (gpointer co,
registry->store = co;
registry->account = account; /* weak */
registry->self = self; /* weak */
+#ifdef HAVE_EDS_2_31_2
+ g_object_ref (co);
+#else
camel_object_ref (co);
+#endif
return registry;
}
@@ -1847,8 +1857,16 @@ store_registry_new (gpointer co,
static void
store_registry_free (StoreRegistry *registry)
{
+#ifdef HAVE_EDS_2_31_2
+ g_signal_handler_disconnect (registry->store, registry->hook_id);
+#else
camel_object_remove_event (registry->store, registry->hook_id);
+#endif
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (registry->store);
+#else
camel_object_unref (registry->store);
+#endif
g_slice_free (StoreRegistry, registry);
}
@@ -1876,27 +1894,45 @@ on_got_folderinfo_register (CamelStore *
/* Hook up catching folder changes in the store */
registry = store_registry_new (store, account, self);
+#ifdef HAVE_EDS_2_31_2
+ hook_id = g_signal_connect (store, "folder-created",
+ G_CALLBACK (on_folder_created),
+ registry);
+#else
hook_id = camel_object_hook_event (store, "folder_created",
CAMEL_CALLBACK (on_folder_created),
registry);
+#endif
registry->hook_id = hook_id;
g_hash_table_replace (priv->registered_stores,
GINT_TO_POINTER (hook_id),
registry);
registry = store_registry_new (store, account, self);
+#ifdef HAVE_EDS_2_31_2
+ hook_id = g_signal_connect (store, "folder-renamed",
+ G_CALLBACK (on_folder_renamed),
+ registry);
+#else
hook_id = camel_object_hook_event (store, "folder_renamed",
CAMEL_CALLBACK (on_folder_renamed),
registry);
+#endif
registry->hook_id = hook_id;
g_hash_table_replace (priv->registered_stores,
GINT_TO_POINTER (hook_id),
registry);
registry = store_registry_new (store, account, self);
+#ifdef HAVE_EDS_2_31_2
+ hook_id = g_signal_connect (store, "folder-deleted",
+ G_CALLBACK (on_folder_deleted),
+ registry);
+#else
hook_id = camel_object_hook_event (store, "folder_deleted",
CAMEL_CALLBACK (on_folder_deleted),
registry);
+#endif
registry->hook_id = hook_id;
g_hash_table_replace (priv->registered_stores,
GINT_TO_POINTER (hook_id),
@@ -1921,24 +1957,20 @@ register_account (TrackerEvolutionPlugin
{
CamelProvider *provider;
CamelStore *store;
- CamelException ex;
char *uri;
RegisterInfo *reg_info;
if (!account->enabled || !(uri = account->source->url))
return;
- camel_exception_init (&ex);
- if (!(provider = camel_provider_get(uri, &ex))) {
- camel_exception_clear (&ex);
+ if (!(provider = camel_provider_get(uri, NULL))) {
return;
}
if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
return;
- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
- camel_exception_clear (&ex);
+ if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
return;
}
@@ -1953,7 +1985,11 @@ register_account (TrackerEvolutionPlugin
/* Get the account's folder-info and register it asynchronously */
mail_get_folderinfo (store, NULL, on_got_folderinfo_register, reg_info);
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (store);
+#else
camel_object_unref (store);
+#endif
}
static gboolean
@@ -1992,22 +2028,18 @@ unregister_account (TrackerEvolutionPlug
{
CamelProvider *provider;
CamelStore *store;
- CamelException ex;
char *uri = account->source->url;
RegisterInfo *reg_info;
- camel_exception_init (&ex);
- if (!(provider = camel_provider_get(uri, &ex))) {
- camel_exception_clear (&ex);
+ if (!(provider = camel_provider_get(uri, NULL))) {
return;
}
if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
return;
- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
- camel_exception_clear (&ex);
+ if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) {
return;
}
@@ -2020,7 +2052,11 @@ unregister_account (TrackerEvolutionPlug
/* Get the account's folder-info and unregister asynchronously */
mail_get_folderinfo (store, NULL, on_got_folderinfo_unregister, reg_info);
+#ifdef HAVE_EDS_2_31_2
+ g_object_unref (store);
+#else
camel_object_unref (store);
+#endif
}
static void

12
tracker-removeable-media-off.patch
View File

@ -1,11 +1,11 @@
Index: tracker-0.9.14/src/miners/fs/tracker-config.c
Index: tracker-0.9.19/src/miners/fs/tracker-config.c
===================================================================
--- tracker-0.9.14.orig/src/miners/fs/tracker-config.c
+++ tracker-0.9.14/src/miners/fs/tracker-config.c
@@ -46,7 +46,7 @@
--- tracker-0.9.19.orig/src/miners/fs/tracker-config.c
+++ tracker-0.9.19/src/miners/fs/tracker-config.c
@@ -44,7 +44,7 @@
#define DEFAULT_INITIAL_SLEEP 15 /* 0->1000 */
#define DEFAULT_ENABLE_MONITORS TRUE
#define DEFAULT_THROTTLE 0 /* 0->20 */
#define DEFAULT_SCAN_TIMEOUT 0 /* 0->1000 */
#define DEFAULT_CACHE_TIMEOUT 60 /* 0->1000 */
-#define DEFAULT_INDEX_REMOVABLE_DEVICES TRUE
+#define DEFAULT_INDEX_REMOVABLE_DEVICES FALSE
#define DEFAULT_INDEX_OPTICAL_DISCS FALSE

137
tracker.changes
View File

@ -1,3 +1,140 @@
-------------------------------------------------------------------
Thu Sep 2 20:19:38 CEST 2010 - vuntz@opensuse.org
- Update to version 0.9.19:
+ Collation support
+ Refactored signal notification API
+ Ontology: Added nmo:isEmergency property
+ functional-tests:
- Avoid FTS tests if FTS is disabled
- Don't include TTL files in dist (tarball was 26Mb vs. 6Mb)
+ libtracker-data: Fixed memory leak when setting journal_mode
pragma
+ libtracker-miner:
- If CREATED event is received from a monitor, force IRI cache
update
- Don't print paths as they may not be in UTF-8, print URIs
+ tracker-extract: Fixed xine, mplayer and totem backends
+ tracker-miner-fs:
- Removed CacheTimeout option from config, unused
- Removed ScanTimeout from config, unused
- Disable crawling entirely if !initial_crawl
+ nokia#184505: Video files without audio are listed as music
clips.
+ nokia#179465: Cannot sort lower and upper cases for under same
letter
+ Fix build warnings, and other build issues.
+ Updated translations.
- Rebase tracker-removeable-media-off.patch.
- Add libgupnp-dlna-devel BuildRequires on 11.4 and later.
-------------------------------------------------------------------
Wed Sep 1 07:57:29 UTC 2010 - aj@suse.de
- Change lang package Requires to Recommends since it is not
mandatory at runtime.
-------------------------------------------------------------------
Fri Aug 27 21:32:31 CEST 2010 - dimstar@opensuse.org
- Update to version 0.9.18:
+ Ontology:
- Renamed slo:longitudeUncertainty to slo:horizontalAccuracy
- Renamed slo:latitudeUncertainty to slo:verticalAccuracy
+ libtracker-data:
- Fixed journal reader with rotated journals
- Make sure tracker_fts_update_commit() is called for FTS
updates
+ libtracker-direct:
- Use maximum D-Bus timeout
- Wait for tracker-store to be ready
+ libtracker-bus:
- Use maximum D-Bus timeout
- Fixed linking to include libtracker-sparql
- Throw errors for non-FD passing when Cancellable is cancelled
- Support BatchUpdate for low priority requests
+ libtracker-sparql:
- Added debugging to know what SPARQL is used with
direct-access
- Added TRACKER_SPARQL_BACKEND environment variable
- Added deps file for tracker-sparql.vapi to distribution
- cursor_get_n_columns() should only be called after
cursor_next()
+ libtracker-miner:
- Allow API to bypass config dir checks for user based indexing
- Add method to reindex certain mimetypes
- Add method to invoke tracker-miner-fs to index a file
+ tracker-store:
- Fixed race conditions with new 'Wait' d-bus interface
- Fixed unregister_g_object() criticals
- Small busy callback improvements, indexing speed increased
+ tracker-miner-fs:
- Remove --add-file option (now done using tracker-control -f)
- Added debugging to know which file is requested to be indexed
over D-Bus
- Use tracker_dbus_request_failed() for error situations
- Do not index dirs unconditionally when adding monitors, huge
crawling performance improvement
- Renamed Reindex D-Bus interface to Index
+ tracker-control:
- Make -f and -m outputs translatable
- Print when reindexing mime types or files is successful
- Don't print PIDs if we're reindexing mimes or a file
- Use TrackerMinerManager to reindex mimetypes
+ tracker-tag: Bail out if none of the passed files exist in the
store
+ bgo#613252: Application-driven indexing and metadata storage
+ bgo#627893: tracker 0.9.17 does not compile with
e-d-s/evolution 2.31.90 built with gtk+ 3.0
+ nokia#187148: "Not tagged, file is not indexed" message is seen
when adding a tag
+ nokia#184505: Video files without audio are listed as music
clips.
+ Updated translations.
-------------------------------------------------------------------
Thu Aug 19 02:15:58 CEST 2010 - dimstar@opensuse.org
- Update to version 0.9.17:
+ SPARQL: Improve lexer performance for strings with ASCII
characters
+ libtracker-common: Make sure libtracker-sparql inherits
verbosity
+ libtracker-data:
- Merged DataError into TrackerSparqlError, was causing
miner-fs to not finish
- Remove unused Options database table
+ libtracker-sparql:
- Added dbus-glib-1 dependency when building Vala sources
- Added example documentation for update_blank() API
+ libtracker-bus: Catch SPARQL errors thrown by D-Bus
+ tracker-extract:
- MP3: Fixed extraction of certain ID3v2.3 and ID3v2.4 tags
- MP3: Fixed un-unsynchronisation in ID3v2
+ tracker-store:
- Fixed some memory leaks in dbus shutdown
- Removed plugin support (was only used by kmail)
+ tracker-miner-fs: Fixed memory leak when setting up volumes
+ tracker-search:
- Fixed typo, output was "Contacts:" when it should be "Files:"
- Improved output for --contacts and --files
+ kmail: Removed this plugin, it was unmaintained
+ Functional Tests: refactoring branch merged, much more
comprehensive testings now
+ bgo#627281: crash in tracker-0.8.15 ms-office extractor
+ bgo#623005: Remove odt2txt dependency in the OASIS extractor
+ bgo#623207: tracker 0.8.6/0.9.x fails to build against
evolution 2.31.4
+ nokia#185950: COREWEB: /usr/lib/tracker/tracker-extract
'*__GI_strncmp extract_gif get_file_metadata tra
+ nokia#185070: Enable PNG_iTXt_SUPPORTED flag in libpng
+ nokia#182948: Keywords/Subject metadata not written back to the
file
+ nokia#184882: tracker-extract is getting crashed for malformed
gif files
+ Updated translations.
- Drop tracker-fix-new-evo.patch, upstream fixed.
-------------------------------------------------------------------
Sun Aug 15 16:29:10 CEST 2010 - dimstar@opensuse.org

19
tracker.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package tracker (Version 0.9.16)
# spec file for package tracker (Version 0.9.19)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Luis Medinas, Portugal
@ -19,17 +19,14 @@
Name: tracker
Version: 0.9.16
Version: 0.9.19
Release: 1
# FIXME: add libgupnp-dlna-devel BuildRequires when it's in Factory
# FIXME: 2010-03-24 building gtk-doc fails because of a bug in graphviz
License: GPLv2+
Summary: Powerful object database, tag/metadata database, search tool and indexer
Url: http://projects.gnome.org/tracker/
Group: Productivity/Other
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM tracker-fix-new-evo.patch bgo623207 vuntz@opensuse.org -- Fix build with recent e-d-s
Patch0: tracker-fix-new-evo.patch
# PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. See bgo#622288 for how it should be done properly.
Patch1: tracker-removeable-media-off.patch
BuildRequires: NetworkManager-devel
@ -58,6 +55,9 @@ BuildRequires: gnome-keyring-devel
%endif
BuildRequires: libgrss-devel
BuildRequires: libgsf-devel
%if 0%{?suse_version} >= 1140
BuildRequires: libgupnp-dlna-devel
%endif
BuildRequires: libicu-devel
BuildRequires: libiptcdata-devel
BuildRequires: libpng-devel
@ -76,7 +76,7 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: vala-devel
BuildRequires: zlib-devel
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -99,7 +99,7 @@ License: GPLv2+
Summary: Graphical User Interface for Tracker
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
%description gui
Tracker is a powerful desktop-neutral first class object
@ -230,7 +230,7 @@ License: GPLv2+
Summary: A GNOME panel applet for Tracker
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
%description applet
Tracker is a powerful desktop-neutral first class object
@ -257,8 +257,8 @@ License: GPLv2+
Summary: Tracker Plugin for Nautilus
Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: %{name}-lang = %{version}
Requires: nautilus
Recommends: %{name}-lang
Supplements: packageand(%{name}:nautilus}
%description -n nautilus-tracker
@ -271,7 +271,6 @@ This package contains an nautilus plugin for Tracker integration.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%patch1 -p1
%build