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

Update tracker to version 0.6.96.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-03-21 10:41:37 +00:00
parent c201034eea
commit 86c563ff27
11 changed files with 70 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/gnome/tracker/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.21 2009/12/21 18:03:20 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2010/03/21 10:41:37 ajacoutot Exp $
COMMENT= powerful desktop search tool and indexer
# there is already audio/tracker, so this port has to live
# as tracker-search.
GNOME_PROJECT= tracker
GNOME_VERSION= 0.6.95
PKGNAME= tracker-search-${VERSION}p5
GNOME_VERSION= 0.6.96
PKGNAME= tracker-search-${VERSION}
SHARED_LIBS += stemmer 0.1 # .695.0
SHARED_LIBS += tracker-common 0.1 # .695.0
@ -48,7 +48,7 @@ LIB_DEPENDS= vorbis::audio/libvorbis \
gsf-1::devel/libgsf \
notify::devel/libnotify \
exif::graphics/libexif \
gmime-2.0:gmime->=2.2,<2.4:mail/gmime \
exempi.>=1::textproc/exempi \
gsttag-0.10:gstreamer-plugins-base->=0.10.25:multimedia/gstreamer-0.10/plugins-base \
poppler-glib,poppler::print/poppler \
raptor::textproc/raptor \
@ -64,9 +64,8 @@ MODPY_RUNDEP= No
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-external-qdbm \
--enable-video-extractor="gstreamer" \
--enable-video-extractor=gstreamer \
--disable-unac \
--disable-xmp \
--disable-hal \
--enable-libexif \
--enable-libgsf \
@ -74,9 +73,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-libtiff \
--enable-libvorbis \
--enable-gdkpixbuf \
--enable-deskbar-applet \
--with-deskbar_applet_dir=${PREFIX}/libexec/deskbar-applet/modules-2.20-compatible \
--with-deskbar-applet-handler-dir="${LOCALBASE}/lib/python${MODPY_VERSION}/site-packages/deskbar/handlers/"
--with-deskbar_applet_dir=${PREFIX}/libexec/deskbar-applet/modules-2.20-compatible
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
x11/gnome/tracker/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/tracker-0.6.95.tar.bz2) = pO3IqoMAcL0/HYCn3wfIDA==
RMD160 (gnome/tracker-0.6.95.tar.bz2) = Ews6BxAObBa9Ut4YrmVJWPoRTHg=
SHA1 (gnome/tracker-0.6.95.tar.bz2) = TM+Mup62l/WLrdrHCo+eNmFrqJg=
SHA256 (gnome/tracker-0.6.95.tar.bz2) = D+QjUxF8YszJ3js8nBGs9wegcC0wzSS40c0eJYHewzk=
SIZE (gnome/tracker-0.6.95.tar.bz2) = 1399996
MD5 (gnome/tracker-0.6.96.tar.bz2) = pk0wTVKGaq6FT0OD+1C4vA==
RMD160 (gnome/tracker-0.6.96.tar.bz2) = a6xUeVqLBWcEIdkFMycb7sW6fZk=
SHA1 (gnome/tracker-0.6.96.tar.bz2) = s1qwiDT1Xaq0KtULLy0zrSGskKU=
SHA256 (gnome/tracker-0.6.96.tar.bz2) = o4iNqqHBI1jDc7PPPt0Ape7RBWMyFSuwmZR3Z9Kdm5U=
SIZE (gnome/tracker-0.6.96.tar.bz2) = 1470210

10
x11/gnome/tracker/patches/patch-configure
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-configure,v 1.1 2009/10/12 17:42:55 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2010/03/21 10:41:37 ajacoutot Exp $
deskbar-applet is not really needed for tracker to build but we still
want the functionnality. We cannot add deskbar-applet as a build
dependency without creating a loop:
evince -> nautilus -> tracker -> deskbar-applet -> py-gnome-desktop -> evince
--- configure.orig Mon Oct 12 19:21:21 2009
+++ configure Mon Oct 12 19:21:59 2009
@@ -18832,17 +18832,6 @@ else
--- configure.orig Thu Feb 4 11:56:45 2010
+++ configure Thu Feb 4 14:09:19 2010
@@ -16007,17 +16007,6 @@ else
enable_deskbar_applet=auto
fi
@ -24,4 +24,4 @@ evince -> nautilus -> tracker -> deskbar-applet -> py-gnome-desktop -> evince
-
if test "x$enable_deskbar_applet" = "xyes"; then
if test "x$have_deskbar_applet" = "xno"; then
{ { $as_echo "$as_me:$LINENO: error: Couldn't find deskbar-applet >= 2.16." >&5
as_fn_error "Couldn't find deskbar-applet >= 2.16." "$LINENO" 5

34
x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-type-utils_c
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_libtracker-common_tracker-type-utils_c,v 1.1.1.1 2009/04/21 21:34:46 jasper Exp $
tracker-type-utils.c: In function `tracker_string_to_date':
tracker-type-utils.c:539: error: invalid operands to binary -
--- src/libtracker-common/tracker-type-utils.c.orig Wed Apr 8 00:04:00 2009
+++ src/libtracker-common/tracker-type-utils.c Wed Apr 15 17:16:37 2009
@@ -21,7 +21,10 @@
#include "config.h"
+#if !defined(__OpenBSD__)
#define _XOPEN_SOURCE
+#endif
+#include <sys/types.h>
#include <time.h>
#include <strings.h>
@@ -528,11 +531,15 @@ tracker_string_to_date (const gchar *date_string)
tm.tm_sec = strtoul (date_string, (gchar**) &date_string, 10);
}
+#if !(defined(__FreeBSD__) || defined(__OpenBSD__))
/* mktime() always assumes that "tm" is in locale time but we
* want to keep control on time, so we go to UTC
*/
t = mktime (&tm);
t -= timezone;
+#else
+ t = timegm (&tm);
+#endif
if (*date_string == '+' ||
*date_string == '-') {

12
x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.4 2009/10/12 17:42:55 ajacoutot Exp $
$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.5 2010/03/21 10:41:37 ajacoutot Exp $
- use glib's strndup(), instead of libc's version. Which may not be present
on every system.
--- src/tracker-extract/tracker-extract-mp3.c.orig Wed May 20 18:28:31 2009
+++ src/tracker-extract/tracker-extract-mp3.c Mon Oct 12 19:24:57 2009
@@ -853,7 +853,7 @@ get_id3v24_tags (const gchar *data,
--- src/tracker-extract/tracker-extract-mp3.c.orig Thu Feb 4 14:08:52 2010
+++ src/tracker-extract/tracker-extract-mp3.c Thu Feb 4 14:09:01 2010
@@ -1082,7 +1082,7 @@ get_id3v24_tags (const gchar *data,
NULL, NULL, NULL);
break;
case 0x03 :
- word = strndup (&data[pos+11], csize-1);
+ word = g_strndup (&data[pos+11], csize-1);
- word = strndup (&data[pos + 11], csize - 1);
+ word = g_strndup (&data[pos + 11], csize - 1);
break;
default:

19
x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-indexer_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_tracker-indexer_tracker-indexer_c,v 1.2 2009/10/15 20:55:08 jasper Exp $
We do not support HAL.
--- src/tracker-indexer/tracker-indexer.c.orig Wed May 20 18:28:31 2009
+++ src/tracker-indexer/tracker-indexer.c Thu Oct 15 14:04:13 2009
@@ -1760,8 +1760,11 @@ item_add_or_update (TrackerIndexer *indexer,
/* Service wasn't previously indexed */
id = tracker_data_update_get_new_service_id (indexer->private->common);
data = tracker_module_metadata_get_hash_table (metadata);
+#ifdef HAVE_HAL
udi = tracker_hal_udi_get_for_path (indexer->private->hal, service_path);
-
+#else
+ udi = NULL;
+#endif
context = tracker_data_update_metadata_context_new (TRACKER_CONTEXT_TYPE_INSERT,
service, id);

30
x11/gnome/tracker/patches/patch-src_tracker-indexer_tracker-removable-device_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_tracker-indexer_tracker-removable-device_c,v 1.2 2009/10/15 20:55:08 jasper Exp $
We do not support HAL.
--- src/tracker-indexer/tracker-removable-device.c.orig Mon May 11 18:15:55 2009
+++ src/tracker-indexer/tracker-removable-device.c Thu Oct 15 14:06:44 2009
@@ -119,7 +119,11 @@ commit_turtle_parse_info_storer (TurtleStorerInfo *inf
data = tracker_module_metadata_get_hash_table (info->metadata);
hal = tracker_indexer_get_hal (info->indexer);
+#ifdef HAVE_HAL
udi = tracker_hal_udi_get_for_path (hal, dest_path);
+#else
+ udi = NULL;
+#endif
tracker_data_update_delete_service_by_path (path, info->rdf_type);
tracker_data_update_replace_service (udi,
@@ -133,7 +137,11 @@ commit_turtle_parse_info_storer (TurtleStorerInfo *inf
data = tracker_module_metadata_get_hash_table (info->metadata);
hal = tracker_indexer_get_hal (info->indexer);
+#ifdef HAVE_HAL
udi = tracker_hal_udi_get_for_path (hal, path);
+#else
+ udi = NULL;
+#endif
tracker_data_update_replace_service (udi,
path,

34
x11/gnome/tracker/patches/patch-src_trackerd_tracker-crawler_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-src_trackerd_tracker-crawler_c,v 1.1 2010/03/21 10:41:37 ajacoutot Exp $
--- src/trackerd/tracker-crawler.c.orig Thu Feb 4 15:47:30 2010
+++ src/trackerd/tracker-crawler.c Thu Feb 4 14:57:28 2010
@@ -22,12 +22,14 @@
#include <string.h>
+#ifndef __OpenBSD__
/* VFAT check, FIXME should we move this elsewhere? */
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/msdos_fs.h>
#include <unistd.h>
/* End of VFAT check includes */
+#endif
#include <gio/gio.h>
@@ -384,6 +386,7 @@ is_path_ignored (TrackerCrawler *crawler,
goto done;
}
+#ifndef __OpenBSD__
/* If the file is on FAT and if the hidden attribute is set, we
* consider the directory to be hidden */
@@ -414,6 +417,7 @@ is_path_ignored (TrackerCrawler *crawler,
goto done;
}
}
+#endif
/* Check module directory ignore patterns */
for (l = crawler->private->ignored_directory_patterns; l; l = l->next) {

10
x11/gnome/tracker/patches/patch-src_trackerd_tracker-monitor_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_trackerd_tracker-monitor_c,v 1.1 2009/10/28 20:28:18 jasper Exp $
$OpenBSD: patch-src_trackerd_tracker-monitor_c,v 1.2 2010/03/21 10:41:37 ajacoutot Exp $
Fix a segfault where there is no monitor running.
--- src/trackerd/tracker-monitor.c.orig Sun Apr 26 12:22:58 2009
+++ src/trackerd/tracker-monitor.c Wed Oct 28 21:06:25 2009
@@ -208,6 +208,7 @@ tracker_monitor_init (TrackerMonitor *object)
--- src/trackerd/tracker-monitor.c.orig Thu Feb 4 11:25:44 2010
+++ src/trackerd/tracker-monitor.c Thu Feb 4 14:09:19 2010
@@ -216,6 +216,7 @@ tracker_monitor_init (TrackerMonitor *object)
GFileMonitor *monitor;
GList *all_modules, *l;
const gchar *name;
@ -12,7 +12,7 @@ Fix a segfault where there is no monitor running.
object->private = TRACKER_MONITOR_GET_PRIVATE (object);
@@ -276,7 +277,17 @@ tracker_monitor_init (TrackerMonitor *object)
@@ -284,7 +285,17 @@ tracker_monitor_init (TrackerMonitor *object)
monitor = g_file_monitor_directory (file,
G_FILE_MONITOR_WATCH_MOUNTS,
NULL,

10
x11/gnome/tracker/patches/patch-src_trackerd_tracker-status_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_trackerd_tracker-status_c,v 1.1 2009/10/09 17:40:12 ajacoutot Exp $
$OpenBSD: patch-src_trackerd_tracker-status_c,v 1.2 2010/03/21 10:41:37 ajacoutot Exp $
Reorder to prevent undefined reference to `low_disk_space_limit_cb'
--- src/trackerd/tracker-status.c.orig Sat Oct 3 17:58:04 2009
+++ src/trackerd/tracker-status.c Sat Oct 3 17:58:22 2009
@@ -89,6 +89,14 @@ static void disk_space_check_stop (void);
--- src/trackerd/tracker-status.c.orig Thu Feb 4 11:25:44 2010
+++ src/trackerd/tracker-status.c Thu Feb 4 14:09:19 2010
@@ -95,6 +95,14 @@ static void disk_space_check_stop (void);
static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
static void
@ -19,7 +19,7 @@ Reorder to prevent undefined reference to `low_disk_space_limit_cb'
private_free (gpointer data)
{
TrackerStatusPrivate *private;
@@ -428,14 +436,6 @@ set_up_throttle (gboolean debugging)
@@ -495,14 +503,6 @@ set_up_throttle (gboolean debugging)
}
}
}

6
x11/gnome/tracker/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2009/12/21 18:03:20 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2010/03/21 10:41:37 ajacoutot Exp $
@bin bin/tracker-applet
@bin bin/tracker-files
@bin bin/tracker-info
@ -95,6 +95,9 @@ lib/tracker/extract-modules/libextract-tiff.so
lib/tracker/extract-modules/libextract-vorbis.a
lib/tracker/extract-modules/libextract-vorbis.la
lib/tracker/extract-modules/libextract-vorbis.so
lib/tracker/extract-modules/libextract-xmp.a
lib/tracker/extract-modules/libextract-xmp.la
lib/tracker/extract-modules/libextract-xmp.so
lib/tracker/filters/
lib/tracker/filters/application/
lib/tracker/filters/application/csv_filter
@ -174,7 +177,6 @@ libexec/deskbar-applet/modules-2.20-compatible/tracker-module.py
@man man/man1/tracker-stats.1
@man man/man1/tracker-status.1
@man man/man1/tracker-tag.1
@man man/man1/tracker-thumbnailer.1
@man man/man1/tracker-unique.1
@man man/man1/trackerd.1
@man man/man5/tracker.cfg.5