From 9ac05f131738d7e07da5df4bb92e2986e59ea1fd Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 6 Feb 2013 15:54:46 +0000 Subject: [PATCH] Update to meta-tracker-0.14.5. --- x11/gnome/tracker/Makefile | 22 +++---- x11/gnome/tracker/distinfo | 4 +- x11/gnome/tracker/patches/patch-configure | 8 +-- .../patch-src_libtracker-common_Makefile_in | 8 +-- ...tch-src_libtracker-miner_tracker-monitor_c | 65 ------------------- .../patch-src_tracker-control_Makefile_in | 8 +-- .../patch-tests_libtracker-miner_Makefile_in | 26 ++++---- 7 files changed, 36 insertions(+), 105 deletions(-) delete mode 100644 x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile index 0fd2b2a0324..51ccee9ef6e 100644 --- a/x11/gnome/tracker/Makefile +++ b/x11/gnome/tracker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.125 2012/11/16 07:22:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.126 2013/02/06 15:54:46 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT-evolution= (meta-)tracker indexer plugin for evolution COMMENT-nautilus= (meta-)tracker tagging plugin for nautilus GNOME_PROJECT= tracker -GNOME_VERSION= 0.14.4 +GNOME_VERSION= 0.14.5 # there is already audio/tracker, so this port has to live # as meta-tracker. @@ -17,9 +17,6 @@ PKGNAME-main= meta-tracker-${VERSION} PKGNAME-evolution= evolution-meta-tracker-${VERSION} PKGNAME-nautilus= nautilus-meta-tracker-${VERSION} -REVISION-main = 2 -REVISION-nautilus = 1 - # Only get the first x.y which is needed in the PLIST. # NOTE: when MAJ_V changes, increment TRACKER_VERSION accordingly and bump: # net/telepathy/folks @@ -51,18 +48,17 @@ MODULES= devel/gettext \ MULTI_PACKAGES= -main -nautilus -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes -WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm drm expat ffi fontconfig +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes z icui18n +WANTLIB += Xi Xinerama Xrandr Xrender expat ffi fontconfig pthread WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += kvm m pcre pixman-1 pthread-stubs xcb xcb-render xcb-shm -WANTLIB += ICE SM atk-bridge-2.0 atspi harfbuzz icudata icule -WANTLIB += z icui18n pthread icuuc +WANTLIB += ICE SM atk-bridge-2.0 atspi harfbuzz icudata icule icuuc WANTLIB-main += ${WANTLIB} WANTLIB-main += archive atk-1.0 bz2 c cairo cairo-gobject WANTLIB-main += dbus-1 dbus-glib-1 e2fs-uuid enca exempi exif gconf-2 -WANTLIB-main += gcrypt gdk-3 gdk_pixbuf-2.0 gee gif gmime-2.6 -WANTLIB-main += gnome-keyring gpg-error gsf-1 gtk-3 +WANTLIB-main += gcrypt gdk-3 gdk_pixbuf-2.0 gee-0.8 gif gmime-2.6 +WANTLIB-main += gnome-keyring gpg-error gsf-1 gtk-3 Xau WANTLIB-main += jpeg lcms2 lzma openjpeg panel-applet-4 cue WANTLIB-main += pango-1.0 pangocairo-1.0 pangoft2-1.0 png poppler poppler-glib WANTLIB-main += rest-0.7 soup-2.4 soup-gnome-2.4 sqlite3 stdc++ @@ -89,7 +85,7 @@ WANTLIB-nautilus += lib/tracker-${MAJ_V}/tracker-common WANTLIB-nautilus += lib/tracker-${MAJ_V}/tracker-data WANTLIB-nautilus += atk-1.0 cairo cairo-gobject e2fs-uuid gdk-3 gdk_pixbuf-2.0 WANTLIB-nautilus += gtk-3 nautilus-extension pango-1.0 pangocairo-1.0 dbus-1 -WANTLIB-nautilus += pangoft2-1.0 png sqlite3 tracker-sparql-0.14 stdc++ +WANTLIB-nautilus += pangoft2-1.0 png sqlite3 tracker-sparql-0.14 BUILD_DEPENDS= lang/vala @@ -98,7 +94,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \ x11/gnome/totem-pl-parser \ print/poppler \ devel/libgsf \ - devel/libgee06 \ + devel/libgee \ net/librest \ sysutils/upower \ textproc/exempi \ diff --git a/x11/gnome/tracker/distinfo b/x11/gnome/tracker/distinfo index aa016574d01..4837848934f 100644 --- a/x11/gnome/tracker/distinfo +++ b/x11/gnome/tracker/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/tracker-0.14.4.tar.xz) = uBjuQrkAepSy+ARu3EcGuyA2GH1f0wTnriPl0vz4WRg= -SIZE (gnome/tracker-0.14.4.tar.xz) = 5946796 +SHA256 (gnome/tracker-0.14.5.tar.xz) = yr73XrGK01IIAA3Ecr3CCnQml5lBRSfubhwcHPso7sg= +SIZE (gnome/tracker-0.14.5.tar.xz) = 6065728 diff --git a/x11/gnome/tracker/patches/patch-configure b/x11/gnome/tracker/patches/patch-configure index 493eaa0f434..f7fd653cc06 100644 --- a/x11/gnome/tracker/patches/patch-configure +++ b/x11/gnome/tracker/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.13 2012/11/01 18:26:01 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.14 2013/02/06 15:54:47 ajacoutot Exp $ Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4} ---- configure.orig Thu Nov 1 18:45:37 2012 -+++ configure Thu Nov 1 19:08:11 2012 -@@ -20968,6 +20968,9 @@ else +--- configure.orig Wed Feb 6 15:49:04 2013 ++++ configure Wed Feb 6 16:05:10 2013 +@@ -20983,6 +20983,9 @@ else fi ;; diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-common_Makefile_in b/x11/gnome/tracker/patches/patch-src_libtracker-common_Makefile_in index a2ddf8c3b6e..b5b9b883009 100644 --- a/x11/gnome/tracker/patches/patch-src_libtracker-common_Makefile_in +++ b/x11/gnome/tracker/patches/patch-src_libtracker-common_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_libtracker-common_Makefile_in,v 1.9 2012/11/01 18:26:01 ajacoutot Exp $ +$OpenBSD: patch-src_libtracker-common_Makefile_in,v 1.10 2013/02/06 15:54:47 ajacoutot Exp $ Needed by patch-src_libtracker-common_tracker-dbus_c. ---- src/libtracker-common/Makefile.in.orig Thu Nov 1 18:45:43 2012 -+++ src/libtracker-common/Makefile.in Thu Nov 1 19:08:11 2012 -@@ -522,7 +522,7 @@ libtracker_common_la_LDFLAGS = \ +--- src/libtracker-common/Makefile.in.orig Wed Feb 6 15:49:06 2013 ++++ src/libtracker-common/Makefile.in Wed Feb 6 16:05:10 2013 +@@ -543,7 +543,7 @@ libtracker_common_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) libtracker_common_la_LIBADD = $(BUILD_LIBS) $(LIBTRACKER_COMMON_LIBS) \ diff --git a/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c b/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c deleted file mode 100644 index cf2632adf91..00000000000 --- a/x11/gnome/tracker/patches/patch-src_libtracker-miner_tracker-monitor_c +++ /dev/null @@ -1,65 +0,0 @@ -$OpenBSD: patch-src_libtracker-miner_tracker-monitor_c,v 1.9 2012/11/16 07:22:51 ajacoutot Exp $ - -From 0fbb71aeba428789340e53bf10e1d9afbc0f3193 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Thu, 15 Nov 2012 19:06:50 +0000 -Subject: tracker-monitor: add support for GKqueueDirectoryMonitor - ---- src/libtracker-miner/tracker-monitor.c.orig Wed Feb 15 16:19:19 2012 -+++ src/libtracker-miner/tracker-monitor.c Thu Nov 15 16:51:07 2012 -@@ -23,6 +23,13 @@ - #include - #include - -+#if defined (__OpenBSD__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__APPLE__) -+#include -+#include -+#include -+#define TRACKER_MONITOR_KQUEUE -+#endif -+ - #include "tracker-monitor.h" - #include "tracker-marshal.h" - -@@ -119,6 +126,7 @@ static void tracker_monitor_get_property (GO - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static guint get_kqueue_limit (void); - static guint get_inotify_limit (void); - static GFileMonitor * directory_monitor_new (TrackerMonitor *monitor, - GFile *file); -@@ -296,6 +304,12 @@ tracker_monitor_init (TrackerMonitor *object) - */ - priv->monitor_limit = MAX (priv->monitor_limit, 0); - } -+ else if (strcmp (name, "GKqueueDirectoryMonitor") == 0) { -+ /* Using kqueue(2) */ -+ g_message ("Monitor backend is kqueue"); -+ -+ priv->monitor_limit = get_kqueue_limit (); -+ } - else if (strcmp (name, "GFamDirectoryMonitor") == 0) { - /* Using Fam */ - g_message ("Monitor backend is Fam"); -@@ -397,6 +411,20 @@ tracker_monitor_get_property (GObject *object, - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -+} -+ -+static guint -+get_kqueue_limit (void) -+{ -+ guint limit = 400; -+ -+#ifdef TRACKER_MONITOR_KQUEUE -+ struct rlimit rl; -+ if (getrlimit (RLIMIT_NOFILE, &rl) == 0) -+ limit = (rl.rlim_cur * 90) / 100; -+#endif /* TRACKER_MONITOR_KQUEUE */ -+ -+ return limit; - } - - static guint diff --git a/x11/gnome/tracker/patches/patch-src_tracker-control_Makefile_in b/x11/gnome/tracker/patches/patch-src_tracker-control_Makefile_in index 3204b0c6846..d2786974f74 100644 --- a/x11/gnome/tracker/patches/patch-src_tracker-control_Makefile_in +++ b/x11/gnome/tracker/patches/patch-src_tracker-control_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_tracker-control_Makefile_in,v 1.4 2012/11/01 18:26:01 ajacoutot Exp $ +$OpenBSD: patch-src_tracker-control_Makefile_in,v 1.5 2013/02/06 15:54:47 ajacoutot Exp $ Needed by patch-src_tracker-control_tracker-control_c. ---- src/tracker-control/Makefile.in.orig Thu Nov 1 18:45:49 2012 -+++ src/tracker-control/Makefile.in Thu Nov 1 19:08:11 2012 -@@ -126,7 +126,7 @@ BUILD_LIBS = @BUILD_LIBS@ +--- src/tracker-control/Makefile.in.orig Wed Feb 6 15:49:07 2013 ++++ src/tracker-control/Makefile.in Wed Feb 6 16:05:10 2013 +@@ -148,7 +148,7 @@ BUILD_LIBS = @BUILD_LIBS@ BUILD_VALAFLAGS = @BUILD_VALAFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ diff --git a/x11/gnome/tracker/patches/patch-tests_libtracker-miner_Makefile_in b/x11/gnome/tracker/patches/patch-tests_libtracker-miner_Makefile_in index 0bbd3d9d8d5..b91241bd7a5 100644 --- a/x11/gnome/tracker/patches/patch-tests_libtracker-miner_Makefile_in +++ b/x11/gnome/tracker/patches/patch-tests_libtracker-miner_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 espie Exp $ ---- tests/libtracker-miner/Makefile.in.orig Thu Nov 1 18:46:00 2012 -+++ tests/libtracker-miner/Makefile.in Sat Nov 10 11:50:19 2012 -@@ -118,7 +118,6 @@ am_tracker_crawler_test_OBJECTS = tracker-crawler-test +$OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.3 2013/02/06 15:54:47 ajacoutot Exp $ +--- tests/libtracker-miner/Makefile.in.orig Wed Feb 6 15:49:11 2013 ++++ tests/libtracker-miner/Makefile.in Wed Feb 6 16:05:10 2013 +@@ -125,7 +125,6 @@ am_tracker_crawler_test_OBJECTS = tracker-crawler-test tracker_crawler_test_OBJECTS = $(am_tracker_crawler_test_OBJECTS) tracker_crawler_test_LDADD = $(LDADD) tracker_crawler_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -9,7 +9,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -128,7 +127,6 @@ tracker_file_notifier_test_OBJECTS = \ +@@ -135,7 +134,6 @@ tracker_file_notifier_test_OBJECTS = \ $(am_tracker_file_notifier_test_OBJECTS) tracker_file_notifier_test_LDADD = $(LDADD) tracker_file_notifier_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -17,7 +17,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -138,7 +136,6 @@ tracker_file_system_test_OBJECTS = \ +@@ -145,7 +143,6 @@ tracker_file_system_test_OBJECTS = \ $(am_tracker_file_system_test_OBJECTS) tracker_file_system_test_LDADD = $(LDADD) tracker_file_system_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -25,7 +25,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -148,7 +145,6 @@ tracker_indexing_tree_test_OBJECTS = \ +@@ -155,7 +152,6 @@ tracker_indexing_tree_test_OBJECTS = \ $(am_tracker_indexing_tree_test_OBJECTS) tracker_indexing_tree_test_LDADD = $(LDADD) tracker_indexing_tree_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -33,7 +33,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -158,7 +154,6 @@ am_tracker_miner_manager_test_OBJECTS = \ +@@ -165,7 +161,6 @@ am_tracker_miner_manager_test_OBJECTS = \ tracker_miner_manager_test_OBJECTS = \ $(am_tracker_miner_manager_test_OBJECTS) am__DEPENDENCIES_2 = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -41,7 +41,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -175,7 +170,6 @@ am_tracker_monitor_test_OBJECTS = tracker-monitor-test +@@ -182,7 +177,6 @@ am_tracker_monitor_test_OBJECTS = tracker-monitor-test tracker_monitor_test_OBJECTS = $(am_tracker_monitor_test_OBJECTS) tracker_monitor_test_LDADD = $(LDADD) tracker_monitor_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -49,7 +49,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -191,7 +185,6 @@ tracker_priority_queue_test_OBJECTS = \ +@@ -198,7 +192,6 @@ tracker_priority_queue_test_OBJECTS = \ $(am_tracker_priority_queue_test_OBJECTS) tracker_priority_queue_test_LDADD = $(LDADD) tracker_priority_queue_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -57,7 +57,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -199,7 +192,6 @@ am_tracker_task_pool_test_OBJECTS = tracker-task-pool- +@@ -206,7 +199,6 @@ am_tracker_task_pool_test_OBJECTS = tracker-task-pool- tracker_task_pool_test_OBJECTS = $(am_tracker_task_pool_test_OBJECTS) tracker_task_pool_test_LDADD = $(LDADD) tracker_task_pool_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -65,7 +65,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -210,7 +202,6 @@ tracker_thumbnailer_test_OBJECTS = \ +@@ -217,7 +209,6 @@ tracker_thumbnailer_test_OBJECTS = \ $(am_tracker_thumbnailer_test_OBJECTS) tracker_thumbnailer_test_LDADD = $(LDADD) tracker_thumbnailer_test_DEPENDENCIES = $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ @@ -73,7 +73,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.2 2012/11/10 11:10:42 esp $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-common/libtracker-common.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -@@ -642,7 +633,6 @@ AM_CPPFLAGS = \ +@@ -653,7 +644,6 @@ AM_CPPFLAGS = \ LDADD = \ $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \