cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we don't end up with the same entry listed several times in the

Browse Source 
default configuration. This fixes crawling on systems where XDG_* special
directories are set to HOME.
This commit is contained in:
ajacoutot 2010-07-20 09:38:34 +00:00
parent bb5c2d9178
commit b4c9935c1c
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/tracker/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.42 2010/07/16 11:56:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.43 2010/07/20 09:38:34 ajacoutot Exp $
COMMENT= powerful desktop search tool and indexer
GNOME_PROJECT= tracker
GNOME_VERSION= 0.8.15
REVISION= 0
# there is already audio/tracker, so this port has to live
# as tracker-search.

32
x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-src_miners_fs_tracker-config_c,v 1.1 2010/07/20 09:38:34 ajacoutot Exp $
If the special dir value is the same as HOME, don't add it to the
default configuration, otherwise we end up with duplicates.
https://bugzilla.gnome.org/show_bug.cgi?id=624806
--- src/miners/fs/tracker-config.c.orig Fri Jul 16 11:52:03 2010
+++ src/miners/fs/tracker-config.c Tue Jul 20 10:28:49 2010
@@ -545,7 +545,13 @@ config_create_with_defaults (TrackerConfig *config,
{
gboolean added_home_recursively = FALSE;
gint i;
+ const gchar *home;
+ home = g_getenv ("HOME");
+ if (! home) {
+ home = g_get_home_dir ();
+ }
+
g_message ("Loading defaults into GKeyFile...");
for (i = 0; i < G_N_ELEMENTS (conversions); i++) {
@@ -592,6 +598,9 @@ config_create_with_defaults (TrackerConfig *config,
const gchar *path;
path = g_get_user_special_dir (dir);
+ if (strcmp((char *)path, home) == 0) {
+ continue;
+ }
if (path == NULL || *path == '\0') {
continue;
}