From b046d640cbae246da0947fe60ea90e35cbe2b33b Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 16 Feb 2012 22:20:02 +0000 Subject: [PATCH] Update to version 0.12.10. Missing @pkgpath marker, spotted by Mikolaj Kucharski. --- x11/gnome/tracker/Makefile | 7 +-- x11/gnome/tracker/distinfo | 10 ++-- ...src_libtracker-common_tracker-file-utils_c | 51 ------------------- ...src_libtracker-common_tracker-file-utils_h | 17 ------- .../patch-src_miners_fs_tracker-config_c | 19 ------- ...-src_tracker-extract_tracker-extract-abw_c | 21 -------- ...-src_tracker-extract_tracker-extract-gif_c | 21 -------- ...-src_tracker-extract_tracker-extract-mp3_c | 38 ++------------ ...-src_tracker-extract_tracker-extract-pdf_c | 21 -------- ...src_tracker-extract_tracker-extract-text_c | 21 -------- ...src_tracker-extract_tracker-extract-tiff_c | 21 -------- ...-src_tracker-extract_tracker-extract-xmp_c | 21 -------- x11/gnome/tracker/pkg/PLIST-main | 3 +- 13 files changed, 12 insertions(+), 259 deletions(-) delete mode 100644 x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_c delete mode 100644 x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_h delete mode 100644 x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-abw_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-gif_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-pdf_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-text_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-tiff_c delete mode 100644 x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-xmp_c diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile index 5f73226af57..f58062d1af0 100644 --- a/x11/gnome/tracker/Makefile +++ b/x11/gnome/tracker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.94 2012/02/02 07:12:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.95 2012/02/16 22:20:02 ajacoutot Exp $ # XXX Binary files patch-src_tracker-control_tracker-control-general_c # and patch-src_tracker-control_tracker-control-general_c.new differ @@ -11,7 +11,7 @@ COMMENT-evolution= (meta-)tracker indexer plugin for evolution COMMENT-nautilus= (meta-)tracker tagging plugin for nautilus GNOME_PROJECT= tracker -GNOME_VERSION= 0.12.9 +GNOME_VERSION= 0.12.10 # there is already audio/tracker, so this port has to live # as meta-tracker. @@ -21,9 +21,6 @@ PKGNAME-main= meta-tracker-${VERSION} PKGNAME-evolution= evolution-meta-tracker-${VERSION} PKGNAME-nautilus= nautilus-meta-tracker-${VERSION} -REVISION-main= 5 -REVISION-evolution=0 - MAJ_V= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/} EVO_VERSION= 3.2 SUBST_VARS= MAJ_V EVO_VERSION diff --git a/x11/gnome/tracker/distinfo b/x11/gnome/tracker/distinfo index 5e0a0b4c98b..b4725f8917f 100644 --- a/x11/gnome/tracker/distinfo +++ b/x11/gnome/tracker/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/tracker-0.12.9.tar.xz) = Q3zpgGEK5X7erTMeKCBXjg== -RMD160 (gnome/tracker-0.12.9.tar.xz) = HGBU/8nzWI2w01X8+wJwOrjUA8I= -SHA1 (gnome/tracker-0.12.9.tar.xz) = tfxUZfPaAMCysjzdwPVaPRtm0Lc= -SHA256 (gnome/tracker-0.12.9.tar.xz) = zNYcj3mQX34JrzpKhjdyJWYB3NMhOw+aP3at0E5VO1w= -SIZE (gnome/tracker-0.12.9.tar.xz) = 5867980 +MD5 (gnome/tracker-0.12.10.tar.xz) = HKgsSOeQAt+fOlSH1ZeVEw== +RMD160 (gnome/tracker-0.12.10.tar.xz) = Tc5CEMVbYjrbxrWWnsFWcqjvkls= +SHA1 (gnome/tracker-0.12.10.tar.xz) = 6f6qKpKHLPG/bpxd1vZvIndWtlU= +SHA256 (gnome/tracker-0.12.10.tar.xz) = QnIoMf3eY8+gfk8Lt1gFQlwJsfGAHT1SgN6L43o1e2k= +SIZE (gnome/tracker-0.12.10.tar.xz) = 6220648 diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_c b/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_c deleted file mode 100644 index e6359da0b54..00000000000 --- a/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_c +++ /dev/null @@ -1,51 +0,0 @@ -$OpenBSD: patch-src_libtracker-common_tracker-file-utils_c,v 1.4 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/libtracker-common/tracker-file-utils.c.orig Fri Dec 16 17:08:04 2011 -+++ src/libtracker-common/tracker-file-utils.c Mon Jan 30 17:34:23 2012 -@@ -50,22 +50,34 @@ - - static GHashTable *file_locks = NULL; - --FILE * --tracker_file_open (const gchar *path) -+int -+tracker_file_open_fd (const gchar *path) - { -- FILE *file; - int fd; - -- g_return_val_if_fail (path != NULL, NULL); -+ g_return_val_if_fail (path != NULL, -1); - - #if defined(__linux__) -- fd = g_open (path, O_RDONLY | O_NOATIME); -+ fd = g_open (path, O_RDONLY | O_NOATIME, 0); - if (fd == -1 && errno == EPERM) { -- fd = g_open (path, O_RDONLY); -+ fd = g_open (path, O_RDONLY, 0); - } - #else -- fd = g_open (path, O_RDONLY); -+ fd = g_open (path, O_RDONLY, 0); - #endif -+ -+ return fd; -+} -+ -+FILE * -+tracker_file_open (const gchar *path) -+{ -+ FILE *file; -+ int fd; -+ -+ g_return_val_if_fail (path != NULL, NULL); -+ -+ fd = tracker_file_open_fd (path); - - if (fd == -1) { - return NULL; diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_h b/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_h deleted file mode 100644 index b406bb4a1cb..00000000000 --- a/x11/gnome/tracker/patches/patch-src_libtracker-common_tracker-file-utils_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_libtracker-common_tracker-file-utils_h,v 1.2 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/libtracker-common/tracker-file-utils.h.orig Fri Dec 16 16:24:23 2011 -+++ src/libtracker-common/tracker-file-utils.h Mon Jan 30 17:34:23 2012 -@@ -32,6 +32,7 @@ G_BEGIN_DECLS - #endif - - /* File utils */ -+int tracker_file_open_fd (const gchar *path); - FILE* tracker_file_open (const gchar *path); - void tracker_file_close (FILE *file, - gboolean need_again_soon); diff --git a/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c b/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c deleted file mode 100644 index 4c4e26f31db..00000000000 --- a/x11/gnome/tracker/patches/patch-src_miners_fs_tracker-config_c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_miners_fs_tracker-config_c,v 1.7 2012/01/01 09:02:11 ajacoutot Exp $ - -Set some sane defaults (which can be changed in the preferences): -* set default indexing speed to 10 (i.e. medium value 0->20) -* don't index removable devices - ---- src/miners/fs/tracker-config.c.orig Fri Dec 16 16:24:23 2011 -+++ src/miners/fs/tracker-config.c Sat Dec 31 10:09:31 2011 -@@ -37,8 +37,8 @@ - #define DEFAULT_SCHED_IDLE 1 - #define DEFAULT_INITIAL_SLEEP 15 /* 0->1000 */ - #define DEFAULT_ENABLE_MONITORS TRUE --#define DEFAULT_THROTTLE 0 /* 0->20 */ --#define DEFAULT_INDEX_REMOVABLE_DEVICES TRUE -+#define DEFAULT_THROTTLE 10 /* 0->20 */ -+#define DEFAULT_INDEX_REMOVABLE_DEVICES FALSE - #define DEFAULT_INDEX_OPTICAL_DISCS FALSE - #define DEFAULT_INDEX_ON_BATTERY FALSE - #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME TRUE diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-abw_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-abw_c deleted file mode 100644 index 2be7af42826..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-abw_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-abw_c,v 1.8 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-abw.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-abw.c Mon Jan 30 17:34:23 2012 -@@ -180,10 +180,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - f = tracker_extract_info_get_file (info); - filename = g_file_get_path (f); - -- fd = g_open (filename, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (filename); - - if (fd == -1) { - g_warning ("Could not open abw file '%s': %s\n", diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-gif_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-gif_c deleted file mode 100644 index 252e6f6123b..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-gif_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-gif_c,v 1.5 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-gif.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-gif.c Mon Jan 30 17:34:23 2012 -@@ -606,10 +606,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - return FALSE; - } - -- fd = g_open (filename, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (filename); - - if (fd == -1) { - g_warning ("Could not open gif file '%s': %s\n", diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c index 098d59cc77b..a1534b680fa 100644 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c +++ b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-mp3_c @@ -1,14 +1,9 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.12 2012/02/02 07:12:23 ajacoutot Exp $ +$OpenBSD: patch-src_tracker-extract_tracker-extract-mp3_c,v 1.13 2012/02/16 22:20:02 ajacoutot Exp $ OpenBSD does not have memmem(). -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-mp3.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-mp3.c Mon Jan 30 17:36:15 2012 +--- src/tracker-extract/tracker-extract-mp3.c.orig Wed Feb 15 11:41:48 2012 ++++ src/tracker-extract/tracker-extract-mp3.c Wed Feb 15 16:52:26 2012 @@ -1049,10 +1049,10 @@ id3v2_strlen (const gchar encoding, case 0x02: @@ -22,30 +17,3 @@ Subject: libtracker-common: Add new function tracker_file_open_fd() } else { pos++; } -@@ -2093,25 +2093,11 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - md.size = size; - buffer_size = MIN (size, MAX_FILE_READ); - --#if defined(__linux__) -- /* Can return -1 because of O_NOATIME, so we try again after -- * without as a last resort. This can happen due to -- * permissions. -- */ -- fd = g_open (filename, O_RDONLY | O_NOATIME); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY); -+ fd = tracker_file_open_fd (filename); - -- if (fd == -1) { -- return FALSE; -- } -- } --#else -- fd = open (filename, O_RDONLY); - if (fd == -1) { - return FALSE; - } --#endif - - #ifndef G_OS_WIN32 - /* We don't use GLib's mmap because size can not be specified */ diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-pdf_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-pdf_c deleted file mode 100644 index db94ef17588..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-pdf_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-pdf_c,v 1.6 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-pdf.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-pdf.c Mon Jan 30 17:34:23 2012 -@@ -311,10 +311,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - file = tracker_extract_info_get_file (info); - filename = g_file_get_path (file); - -- fd = g_open (filename, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (filename); - - if (fd == -1) { - g_warning ("Could not open pdf file '%s': %s\n", diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-text_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-text_c deleted file mode 100644 index 5b16a7471c9..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-text_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-text_c,v 1.7 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-text.c.orig Fri Dec 16 16:37:39 2011 -+++ src/tracker-extract/tracker-extract-text.c Mon Jan 30 17:34:23 2012 -@@ -58,10 +58,7 @@ get_file_content (GFile *file, - /* Get filename from URI */ - path = g_file_get_path (file); - -- fd = g_open (path, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (path, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (path); - - if (fd == -1) { - g_message ("Could not open file '%s': %s", diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-tiff_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-tiff_c deleted file mode 100644 index 31a23bc48f0..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-tiff_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-tiff_c,v 1.5 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-tiff.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-tiff.c Mon Jan 30 17:34:23 2012 -@@ -291,10 +291,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - metadata = tracker_extract_info_get_metadata_builder (info); - graph = tracker_extract_info_get_graph (info); - -- fd = g_open (filename, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (filename); - - if (fd == -1) { - g_warning ("Could not open tiff file '%s': %s\n", diff --git a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-xmp_c b/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-xmp_c deleted file mode 100644 index 796c90a86bc..00000000000 --- a/x11/gnome/tracker/patches/patch-src_tracker-extract_tracker-extract-xmp_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_tracker-extract_tracker-extract-xmp_c,v 1.5 2012/02/02 07:12:23 ajacoutot Exp $ - -From a6ae1d90385b7eb9c4a5bd6a9ca17eb32b666b04 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Tue, 10 Jan 2012 11:45:29 +0000 -Subject: libtracker-common: Add new function tracker_file_open_fd() - ---- src/tracker-extract/tracker-extract-xmp.c.orig Fri Dec 16 16:24:23 2011 -+++ src/tracker-extract/tracker-extract-xmp.c Mon Jan 30 17:34:23 2012 -@@ -154,10 +154,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info - preupdate = tracker_extract_info_get_preupdate_builder (info); - metadata = tracker_extract_info_get_metadata_builder (info); - -- fd = g_open (filename, O_RDONLY | O_NOATIME, 0); -- if (fd == -1 && errno == EPERM) { -- fd = g_open (filename, O_RDONLY, 0); -- } -+ fd = tracker_file_open_fd (filename); - - if (fd == -1) { - g_warning ("Could not open xmp file '%s': %s\n", diff --git a/x11/gnome/tracker/pkg/PLIST-main b/x11/gnome/tracker/pkg/PLIST-main index 7298a6104cd..194cd43204c 100644 --- a/x11/gnome/tracker/pkg/PLIST-main +++ b/x11/gnome/tracker/pkg/PLIST-main @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2011/12/16 17:36:55 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2012/02/16 22:20:02 ajacoutot Exp $ +@pkgpath ${BASE_PKGPATH} @bin bin/tracker-control @bin bin/tracker-explorer @bin bin/tracker-import