Attachment 80776 Details for Bug 115797 – tracker-0.6.1.patch

[patch] tracker-0.6.1.patch

tracker-0.6.1.patch (text/plain), 14.98 KB, created by Yuri Pankov on 2007-08-24 23:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Pankov

Created: 2007-08-24 23:00:05 UTC

Size: 14.98 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/Makefile /usr/ports/sysutils/tracker/Makefile
>--- /usr/ports/sysutils/tracker.orig/Makefile	2007-08-24 16:24:32.000000000 +0400
>+++ /usr/ports/sysutils/tracker/Makefile	2007-08-25 01:29:26.000000000 +0400
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	tracker
>-PORTVERSION=	0.5.4
>-PORTREVISION=	4
>+PORTVERSION=	0.6.1
> CATEGORIES=	sysutils gnome
> MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
> 
>@@ -21,6 +20,7 @@
> 		wv-1.2.3:${PORTSDIR}/textproc/wv \
> 		gmime-2.0.4:${PORTSDIR}/mail/gmime2
> 
>+USE_BZIP2=	yes
> USE_FAM=	yes
> WANT_FAM_SYSTEM=gamin
> USE_GNOME=	gnomedesktop gnomehack gnomeprefix libgsf
>@@ -31,12 +31,18 @@
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
>-CONFIGURE_ARGS=	--enable-gstreamer \
>-		--disable-inotify \
>+CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
>+		--enable-file-monitoring=fam \
>+		--with-session-bus-services-dir=${PREFIX}/share/dbus-1/services \
>+		--enable-deskbar-applet \
> 		--with-deskbar-applet-handler-dir=${PREFIX}/lib/deskbar-applet/handlers
> 
> MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
>-		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
>+		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1 \
>+		tracker-preferences.1 tracker-search-tool.1 tracker-status.1 \
>+		tracker-tag.1 tracker-thumbnailer.1
>+MAN5=		tracker.cfg.5
>+MAN7=		tracker-services.7
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/distinfo /usr/ports/sysutils/tracker/distinfo
>--- /usr/ports/sysutils/tracker.orig/distinfo	2007-08-24 16:24:32.000000000 +0400
>+++ /usr/ports/sysutils/tracker/distinfo	2007-08-24 16:35:54.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (tracker-0.5.4.tar.gz) = 724208e1b2d235148499672b44181298
>-SHA256 (tracker-0.5.4.tar.gz) = ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
>-SIZE (tracker-0.5.4.tar.gz) = 1381786
>+MD5 (tracker-0.6.1.tar.bz2) = 3f706dc73fffa0a7b633b0c0aff6a263
>+SHA256 (tracker-0.6.1.tar.bz2) = 2c671498d7406b25bb6e75dd1799165d0d0abfe4309532aeb6ba5e533556932a
>+SIZE (tracker-0.6.1.tar.bz2) = 1199993
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-keyword-store.h /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-keyword-store.h
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-keyword-store.h	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-keyword-store.h	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./src/libtracker-gtk/tracker-keyword-store.h.orig	2007-03-06 00:37:45.000000000 +0300
>++++ ./src/libtracker-gtk/tracker-keyword-store.h	2007-08-24 22:31:05.000000000 +0400
>+@@ -27,7 +27,7 @@
>+ 
>+ #include <gtk/gtkliststore.h>
>+ 
>+-#include <tracker.h>
>++#include "../libtracker/tracker.h"
>+ 
>+ G_BEGIN_DECLS
>+ 
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-metadata-tile.h /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-metadata-tile.h
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-metadata-tile.h	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-metadata-tile.h	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,12 @@
>+--- ./src/libtracker-gtk/tracker-metadata-tile.h.orig	2007-07-17 00:34:39.000000000 +0400
>++++ ./src/libtracker-gtk/tracker-metadata-tile.h	2007-08-24 22:31:05.000000000 +0400
>+@@ -24,7 +24,8 @@
>+ #define TRACKER_METADATA_TILE_H
>+ 
>+ #include <gtk/gtk.h>
>+-#include <tracker.h>
>++
>++#include "../libtracker/tracker.h"
>+ 
>+ 
>+ #define TRACKER_TYPE_METADATA_TILE		(tracker_metadata_tile_get_type ())
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-tag-bar.h /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-tag-bar.h
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-tag-bar.h	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-tag-bar.h	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./src/libtracker-gtk/tracker-tag-bar.h.orig	2007-07-17 04:35:33.000000000 +0400
>++++ ./src/libtracker-gtk/tracker-tag-bar.h	2007-08-25 00:53:14.000000000 +0400
>+@@ -59,6 +59,8 @@
>+ 				    const gchar 		*uri
>+ 				   );
>+ 
>++GType tracker_tag_bar_get_type(void);
>++
>+ G_END_DECLS
>+ 
>+ #endif /* TRACKER_TAG_BAR_H */
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-utils.h /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-utils.h
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__libtracker-gtk__tracker-utils.h	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__libtracker-gtk__tracker-utils.h	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./src/libtracker-gtk/tracker-utils.h.orig	2007-07-17 20:37:11.000000000 +0400
>++++ ./src/libtracker-gtk/tracker-utils.h	2007-08-24 22:31:05.000000000 +0400
>+@@ -27,7 +27,7 @@
>+ #include <glib.h>
>+ #include <gtk/gtk.h>
>+ 
>+-#include <tracker.h>
>++#include "../libtracker/tracker.h"
>+ 
>+ GList *		tracker_keyword_array_to_glist (gchar **array);
>+ GList *		tracker_get_all_keywords (TrackerClient *tracker_client);
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__sqlite3__os_unix.c /usr/ports/sysutils/tracker/files/patch-src__sqlite3__os_unix.c
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__sqlite3__os_unix.c	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__sqlite3__os_unix.c	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,12 @@
>+--- ./src/sqlite3/os_unix.c.orig	2007-01-25 15:47:11.000000000 +0300
>++++ ./src/sqlite3/os_unix.c	2007-08-24 22:31:05.000000000 +0400
>+@@ -1110,9 +1110,7 @@
>+ ** Use the fdatasync() API only if the HAVE_FDATASYNC macro is defined.
>+ ** Otherwise use fsync() in its place.
>+ */
>+-#ifndef HAVE_FDATASYNC
>+ # define fdatasync fsync
>+-#endif
>+ 
>+ /*
>+ ** Define HAVE_FULLFSYNC to 0 or 1 depending on whether or not
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__tracker-search-tool__tracker-search-tool-support.h /usr/ports/sysutils/tracker/files/patch-src__tracker-search-tool__tracker-search-tool-support.h
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__tracker-search-tool__tracker-search-tool-support.h	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__tracker-search-tool__tracker-search-tool-support.h	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,18 @@
>+--- ./src/tracker-search-tool/tracker-search-tool-support.h.orig	2007-07-21 20:55:20.000000000 +0400
>++++ ./src/tracker-search-tool/tracker-search-tool-support.h	2007-08-24 22:31:05.000000000 +0400
>+@@ -143,6 +143,15 @@
>+ tracker_search_get_stored_window_geometry (gint * width,
>+                                         gint * height);
>+ 
>++void
>++tracker_set_stored_separator_position (int pos);
>++
>++char *
>++tracker_string_replace (const char *haystack, char *needle, char *replacement);
>++
>++int
>++tracker_get_stored_separator_position ();
>++
>+ #ifdef __cplusplus
>+ }
>+ #endif
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src__trackerd__tracker-utils.c /usr/ports/sysutils/tracker/files/patch-src__trackerd__tracker-utils.c
>--- /usr/ports/sysutils/tracker.orig/files/patch-src__trackerd__tracker-utils.c	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/sysutils/tracker/files/patch-src__trackerd__tracker-utils.c	2007-08-25 00:53:19.000000000 +0400
>@@ -0,0 +1,14 @@
>+--- ./src/trackerd/tracker-utils.c.orig	2007-08-05 01:53:12.000000000 +0400
>++++ ./src/trackerd/tracker-utils.c	2007-08-24 22:31:05.000000000 +0400
>+@@ -727,10 +727,7 @@
>+ 		tm.tm_sec = strtoul (timestamp, (char **)&timestamp, 10);
>+ 	}
>+ 
>+-	tt = mktime (&tm);
>+-        /* mktime() always assumes that "tm" is in locale time but
>+-           we want to keep control on time, so we go to UTC */
>+-        tt -= timezone;
>++	tt = timegm (&tm);
>+ 
>+ 	if (*timestamp == '+' || *timestamp == '-') {
>+ 		int sign;
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/files/patch-src_sqlite3_os_unix.c /usr/ports/sysutils/tracker/files/patch-src_sqlite3_os_unix.c
>--- /usr/ports/sysutils/tracker.orig/files/patch-src_sqlite3_os_unix.c	2007-08-24 16:24:32.000000000 +0400
>+++ /usr/ports/sysutils/tracker/files/patch-src_sqlite3_os_unix.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,12 +0,0 @@
>---- src/sqlite3/os_unix.c.orig	Sat Dec  9 21:35:39 2006
>-+++ src/sqlite3/os_unix.c	Sat Dec  9 21:36:02 2006
>-@@ -1110,9 +1110,7 @@
>- ** Use the fdatasync() API only if the HAVE_FDATASYNC macro is defined.
>- ** Otherwise use fsync() in its place.
>- */
>--#ifndef HAVE_FDATASYNC
>- # define fdatasync fsync
>--#endif
>- 
>- /*
>- ** Define HAVE_FULLFSYNC to 0 or 1 depending on whether or not
>diff -ruN --exclude=CVS /usr/ports/sysutils/tracker.orig/pkg-plist /usr/ports/sysutils/tracker/pkg-plist
>--- /usr/ports/sysutils/tracker.orig/pkg-plist	2007-08-24 16:24:32.000000000 +0400
>+++ /usr/ports/sysutils/tracker/pkg-plist	2007-08-24 20:42:38.000000000 +0400
>@@ -1,25 +1,39 @@
>-bin/htmless
> bin/o3totxt
> bin/tracker-extract
> bin/tracker-files
> bin/tracker-meta-folder
>+bin/tracker-preferences
> bin/tracker-query
> bin/tracker-search
> bin/tracker-search-tool
> bin/tracker-stats
>+bin/tracker-status
> bin/tracker-tag
> bin/tracker-thumbnailer
> bin/trackerd
> etc/xdg/autostart/trackerd.desktop
>+include/libtracker-gtk/tracker-gtk.h
>+include/libtracker-gtk/tracker-keyword-store.h
>+include/libtracker-gtk/tracker-metadata-tile.h
>+include/libtracker-gtk/tracker-tag-bar.h
>+include/libtracker-gtk/tracker-ui.h
>+include/libtracker-gtk/tracker-utils.h
> include/tracker-client.h
> include/tracker.h
> lib/deskbar-applet/handlers/tracker-handler.py
>+lib/libtracker-gtk.a
>+lib/libtracker-gtk.la
>+lib/libtracker-gtk.so
>+lib/libtracker-gtk.so.0
> lib/libtrackerclient.a
> lib/libtrackerclient.la
> lib/libtrackerclient.so
> lib/libtrackerclient.so.0
>+lib/tracker/filters/application/csv_filter
> lib/tracker/filters/application/msword_filter
> lib/tracker/filters/application/pdf_filter
>+lib/tracker/filters/application/tab-separated-values_filter
>+lib/tracker/filters/application/vnd.ms-excel_filter
> lib/tracker/filters/application/vnd.oasis.opendocument.presentation-template_filter
> lib/tracker/filters/application/vnd.oasis.opendocument.presentation_filter
> lib/tracker/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
>@@ -29,12 +43,19 @@
> lib/tracker/filters/application/vnd.stardivision.writer_filter
> lib/tracker/filters/application/vnd.sun.xml.calc.template_filter
> lib/tracker/filters/application/vnd.sun.xml.calc_filter
>+lib/tracker/filters/application/vnd.sun.xml.draw_filter
> lib/tracker/filters/application/vnd.sun.xml.impress.template_filter
> lib/tracker/filters/application/vnd.sun.xml.impress_filter
> lib/tracker/filters/application/vnd.sun.xml.writer.template_filter
> lib/tracker/filters/application/vnd.sun.xml.writer_filter
> lib/tracker/filters/application/x-abiword_filter
>+lib/tracker/filters/application/x-gnumeric_filter
>+lib/tracker/filters/text/csv_filter
>+lib/tracker/filters/text/djvu_filter
> lib/tracker/filters/text/html_filter
>+lib/tracker/filters/text/spreadsheet_filter
>+lib/tracker/filters/text/tab-separated-values_filter
>+lib/tracker/filters/text/x-comma-separated-values_filter
> lib/tracker/filters/text/x-tex_filter
> lib/tracker/filters/text/xml_filter
> lib/tracker/thumbnailers/application/pdf_thumbnailer
>@@ -44,11 +65,12 @@
> lib/tracker/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
> lib/tracker/thumbnailers/image/jpeg_thumbnailer
> lib/tracker/thumbnailers/image/png_thumbnailer
>+libdata/pkgconfig/libtracker-gtk.pc
> libdata/pkgconfig/tracker.pc
> share/dbus-1/services/tracker.service
>+share/gnome/applications/tracker-preferences.desktop
> share/gnome/applications/tracker-search-tool.desktop
>-share/gnome/pixmaps/tracker/thumbnail_frame.png
>-share/gnome/pixmaps/tracker/tracker.png
>+share/gnome/tracker/icons/thumbnail_frame.png
> share/gnome/tracker/languages/stopwords.da
> share/gnome/tracker/languages/stopwords.de
> share/gnome/tracker/languages/stopwords.en
>@@ -61,11 +83,38 @@
> share/gnome/tracker/languages/stopwords.pt
> share/gnome/tracker/languages/stopwords.ru
> share/gnome/tracker/languages/stopwords.sv
>+share/gnome/tracker/services/application.metadata
>+share/gnome/tracker/services/audio.metadata
>+share/gnome/tracker/services/default.metadata
>+share/gnome/tracker/services/default.service
>+share/gnome/tracker/services/document.metadata
>+share/gnome/tracker/services/email.metadata
>+share/gnome/tracker/services/file.metadata
>+share/gnome/tracker/services/image.metadata
>+share/gnome/tracker/services/video.metadata
>+share/gnome/tracker/sqlite-cache.sql
>+share/gnome/tracker/sqlite-email.sql
>+share/gnome/tracker/sqlite-metadata.sql
>+share/gnome/tracker/sqlite-service-stored-procs.sql
>+share/gnome/tracker/sqlite-service-triggers.sql
>+share/gnome/tracker/sqlite-service-types.sql
>+share/gnome/tracker/sqlite-service.sql
> share/gnome/tracker/sqlite-stored-procs.sql
>+share/gnome/tracker/sqlite-tracker-triggers.sql
> share/gnome/tracker/sqlite-tracker.sql
>+share/gnome/tracker/sqlite-user-data.sql
> share/gnome/tracker/tracker-introspect.xml
>+share/gnome/tracker/tracker-preferences.glade
>+share/icons/hicolor/16x16/apps/tracker.png
>+share/icons/hicolor/22x22/apps/tracker.png
>+share/icons/hicolor/24x24/apps/tracker.png
>+share/icons/hicolor/32x32/apps/tracker.png
>+share/icons/hicolor/48x48/apps/tracker.png
>+share/icons/hicolor/scalable/apps/tracker.svg
> share/locale/ar/LC_MESSAGES/tracker.mo
>+share/locale/ca/LC_MESSAGES/tracker.mo
> share/locale/de/LC_MESSAGES/tracker.mo
>+share/locale/dz/LC_MESSAGES/tracker.mo
> share/locale/en_GB/LC_MESSAGES/tracker.mo
> share/locale/es/LC_MESSAGES/tracker.mo
> share/locale/et/LC_MESSAGES/tracker.mo
>@@ -73,12 +122,14 @@
> share/locale/fr/LC_MESSAGES/tracker.mo
> share/locale/gl/LC_MESSAGES/tracker.mo
> share/locale/it/LC_MESSAGES/tracker.mo
>+share/locale/mk/LC_MESSAGES/tracker.mo
> share/locale/nb/LC_MESSAGES/tracker.mo
>+share/locale/oc/LC_MESSAGES/tracker.mo
>+share/locale/pt/LC_MESSAGES/tracker.mo
>+share/locale/ru/LC_MESSAGES/tracker.mo
> share/locale/sl/LC_MESSAGES/tracker.mo
> share/locale/sv/LC_MESSAGES/tracker.mo
>-@dirrm share/gnome/tracker/languages
>-@dirrm share/gnome/tracker
>-@dirrm share/gnome/pixmaps/tracker
>+@dirrm include/libtracker-gtk
> @dirrm lib/tracker/thumbnailers/image
> @dirrm lib/tracker/thumbnailers/application
> @dirrm lib/tracker/thumbnailers
>@@ -86,7 +137,15 @@
> @dirrm lib/tracker/filters/application
> @dirrm lib/tracker/filters
> @dirrm lib/tracker
>-@dirrmtry lib/deskbar-applet/handlers
>-@dirrmtry lib/deskbar-applet
>+@dirrm share/gnome/tracker/services
>+@dirrm share/gnome/tracker/languages
>+@dirrm share/gnome/tracker/icons
>+@dirrm share/gnome/tracker
> @dirrmtry etc/xdg/autostart
> @dirrmtry etc/xdg
>+@dirrmtry lib/deskbar-applet/handlers
>+@dirrmtry lib/deskbar-applet
>+@dirrmtry share/locale/oc/LC_MESSAGES
>+@dirrmtry share/locale/oc
>+@dirrmtry share/locale/dz/LC_MESSAGES
>+@dirrmtry share/locale/dz

Actions: View | Diff

Attachments on bug 115797: 80776