Update to (meta-)tracker-0.16.0.

Merge -nautilus into -main.
This commit is contained in:
ajacoutot 2013-03-29 16:28:27 +00:00
parent ac442813b5
commit 0ca0975327
12 changed files with 79 additions and 143 deletions

View File

@ -1,98 +1,62 @@
# $OpenBSD: Makefile,v 1.129 2013/03/29 09:09:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.130 2013/03/29 16:28:27 ajacoutot Exp $
SHARED_ONLY= Yes
SHARED_ONLY= Yes
COMMENT-main= powerful desktop search tool and indexer
COMMENT-evolution= (meta-)tracker indexer plugin for evolution
COMMENT-nautilus= (meta-)tracker tagging plugin for nautilus
COMMENT= powerful desktop search tool and indexer
GNOME_PROJECT= tracker
GNOME_VERSION= 0.14.5
GNOME_PROJECT= tracker
GNOME_VERSION= 0.16.0
# there is already audio/tracker, so this port has to live
# as meta-tracker.
PKGNAME= meta-tracker-${VERSION}
PKGNAME-main= meta-tracker-${VERSION}
PKGNAME-evolution= evolution-meta-tracker-${VERSION}
PKGNAME-nautilus= nautilus-meta-tracker-${VERSION}
PKGNAME= meta-tracker-${VERSION}
# Only get the first x.y which is needed in the PLIST.
# NOTE: when MAJ_V changes, increment TRACKER_VERSION accordingly and bump:
# x11/gnome/documents
# x11/gnome/grilo-plugins
# x11/gnome/photos
MAJ_V= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAJ_V= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
EVO_VERSION= 3.4
SUBST_VARS= MAJ_V EVO_VERSION
EVO_VERSION= 3.4
SUBST_VARS= MAJ_V EVO_VERSION
SHARED_LIBS += tracker-common 2.0 # 1400.0
SHARED_LIBS += tracker-data 2.0 # 1400.0
SHARED_LIBS += tracker-sparql-0.14 0.0 # 1400.0
SHARED_LIBS += tracker-extract-0.14 0.0 # 1400.0
SHARED_LIBS += tracker-miner-0.14 0.0 # 1400.0
SHARED_LIBS += tracker-common 3.0 # 1600.0
SHARED_LIBS += tracker-data 3.0 # 1600.0
SHARED_LIBS += tracker-sparql-0.16 0.0 # 1600.0
SHARED_LIBS += tracker-extract-0.16 0.0 # 1600.0
SHARED_LIBS += tracker-miner-0.16 0.0 # 1600.0
HOMEPAGE= http://projects.gnome.org/tracker/
HOMEPAGE= http://projects.gnome.org/tracker/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext \
x11/gnome \
devel/dconf \
lang/python
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender archive atk-1.0 atk-bridge-2.0
WANTLIB += atspi bz2 c cairo cairo-gobject crypto cue curl dbus-1
WANTLIB += dbus-glib-1 e2fs-uuid enca exempi exif expat ffi fontconfig
WANTLIB += freetype gcrypt gdk-3 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
WANTLIB += gmime-2.6 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
WANTLIB += graphite2 gsf-1 gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3
WANTLIB += harfbuzz icudata icui18n icule icuuc idn jpeg kvm lcms2
WANTLIB += lua5.1 lzma m nautilus-extension openjpeg orc-0.4 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png poppler
WANTLIB += poppler-glib pthread pthread-stubs quvi secret-1 soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 ssl stdc++ tag tag_c tiff totem-plparser
WANTLIB += upower-glib xcb xcb-render xcb-shm xml2 z
MULTI_PACKAGES= -main -nautilus
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 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-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++
WANTLIB-main += tag tag_c tiff totem-plparser upower-glib xml2
WANTLIB-main += gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 gsttag-0.10
WANTLIB-main += crypto curl idn lua5.1 quvi ssl
WANTLIB-evolution += ${WANTLIB}
WANTLIB-evolution += asn1 atk-1.0 cairo cairo-gobject camel-1.2
WANTLIB-evolution += com_err crypto dbus-1 e2fs-uuid
WANTLIB-evolution += ebook-1.2 ecal-1.2 edataserver-1.2 edataserverui-3.0
WANTLIB-evolution += enchant gailutil-3 gconf-2 gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB-evolution += gnome-keyring gpg-error gssapi gtk-3
WANTLIB-evolution += gtkhtml-4.0 gtkhtml-editor-4.0 ical icalss icalvcal
WANTLIB-evolution += krb5 nspr4 nss3 nssutil3 pango-1.0 pangocairo-1.0
WANTLIB-evolution += pangoft2-1.0 plc4 plds4 png smime3 softokn3 soup-2.4
WANTLIB-evolution += sqlite3 ssl3 stdc++ tracker-miner-0.14 tracker-sparql-0.14
WANTLIB-evolution += xml2 dbus-glib-1 ICE SM db ebackend-1.2 gnome-desktop-3
WANTLIB-evolution += lib/tracker-${MAJ_V}/tracker-common
WANTLIB-evolution += lib/tracker-${MAJ_V}/tracker-data
WANTLIB-nautilus += ${WANTLIB}
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
MODULES= devel/gettext \
x11/gnome \
devel/dconf \
lang/python
BUILD_DEPENDS= lang/vala
LIB_DEPENDS-main= ${LIB_DEPENDS} \
x11/gnome/panel \
x11/gnome/totem-pl-parser \
LIB_DEPENDS= x11/gnome/totem-pl-parser \
print/poppler \
devel/libgsf \
devel/libgee \
net/librest \
sysutils/upower \
textproc/exempi \
sysutils/e2fsprogs \
@ -100,20 +64,14 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
graphics/libungif \
audio/libcue \
converters/enca \
audio/taglib
audio/taglib \
multimedia/gstreamer1/plugins-base \
x11/gnome/nautilus
RUN_DEPENDS-evolution= ${MODGETTEXT_RUN_DEPENDS}
# XXX should be a LIB_DEPENDS+WANTLIB but check-lib-depends(1) does not
# work with unversioned solibs (LOCALBASE/lib/evolution/*/*.so).
#BUILD_DEPENDS += mail/evolution,-main
RUN_DEPENDS-evolution +=mail/evolution,-main
LIB_DEPENDS-evolution= ${LIB_DEPENDS} \
x11/gnome/tracker,-main=${GNOME_VERSION}
RUN_DEPENDS-nautilus= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-nautilus= ${LIB_DEPENDS} \
x11/gnome/tracker,-main=${GNOME_VERSION} \
x11/gnome/nautilus>=3.0.0
#RUN_DEPENDS += mail/evolution,-main
LIBTOOL_FLAGS= --tag=disable-static
@ -125,39 +83,37 @@ MODPY_RUNDEP= No
MODPY_ADJ_FILES= tests/tracker-writeback/01-writeback.py
CONFIGURE_ARGS= --disable-static \
--disable-functional-tests \
--disable-miner-thunderbird \
--disable-miner-firefox \
--disable-network-manager \
--disable-qt
CONFIGURE_ARGS= --disable-static \
--disable-functional-tests \
--disable-miner-thunderbird \
--disable-miner-firefox \
--disable-network-manager \
--disable-qt
# needs libgxps
CONFIGURE_ARGS += --disable-libgxps
CONFIGURE_ARGS += --disable-libgxps
# needs libosinfo
CONFIGURE_ARGS += --disable-libosinfo
CONFIGURE_ARGS += --disable-libosinfo
# needs libgrss
CONFIGURE_ARGS += --disable-miner-rss
CONFIGURE_ARGS += --disable-miner-rss
# needs libiptcdata
CONFIGURE_ARGS += --disable-libiptcdata
CONFIGURE_ARGS += --disable-libiptcdata
# XXX temporarily disable tracker,-evolution which does not build with evo >= 3.6.0
# XXX temporarily disable evolution miner which does not build with evo >= 3.6.0
# when fixed:
# uncomment BUILD_DEPENDS on evolution
# uncomment the rm call in post-install
# add -evolution to MULTI_PACKAGES
# add x11/gnome/tracker,-evolution to RUN_DEPENDS-extra in meta/gnome
CONFIGURE_ARGS += --disable-miner-evolution
CONFIGURE_ARGS += --disable-miner-evolution
# XXX make it build until we figure out the full extent of the brain-damage
CONFIGURE_ARGS += --disable-unit-tests
MODGNOME_LDFLAGS= -Wl,-rpath,${TRUEPREFIX}/lib/tracker-${MAJ_V}
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/meta-tracker/
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/meta-tracker/
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/tracker-needle/tracker-utils.vala

View File

@ -1,2 +1,2 @@
SHA256 (gnome/tracker-0.14.5.tar.xz) = yr73XrGK01IIAA3Ecr3CCnQml5lBRSfubhwcHPso7sg=
SIZE (gnome/tracker-0.14.5.tar.xz) = 6065728
SHA256 (gnome/tracker-0.16.0.tar.xz) = KZxqGANwUi0deUwYSq742CItP3N9VkuOXKJbh1FHDE8=
SIZE (gnome/tracker-0.16.0.tar.xz) = 5921104

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.14 2013/02/06 15:54:47 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.15 2013/03/29 16:28:27 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Wed Feb 6 15:49:04 2013
+++ configure Wed Feb 6 16:05:10 2013
@@ -20983,6 +20983,9 @@ else
--- configure.orig Mon Mar 18 17:37:31 2013
+++ configure Fri Mar 29 16:39:44 2013
@@ -20712,6 +20712,9 @@ else
fi
;;

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_libtracker-common_Makefile_in,v 1.10 2013/02/06 15:54:47 ajacoutot Exp $
$OpenBSD: patch-src_libtracker-common_Makefile_in,v 1.11 2013/03/29 16:28:27 ajacoutot Exp $
Needed by patch-src_libtracker-common_tracker-dbus_c.
--- 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 = \
--- src/libtracker-common/Makefile.in.orig Mon Mar 18 17:37:33 2013
+++ src/libtracker-common/Makefile.in Fri Mar 29 16:39:44 2013
@@ -537,7 +537,7 @@ libtracker_common_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libtracker_common_la_LIBADD = $(BUILD_LIBS) $(LIBTRACKER_COMMON_LIBS) \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_tracker-control_tracker-control-general_c,v 1.5 2011/12/16 17:36:55 ajacoutot Exp $
--- src/tracker-control/tracker-control-general.c.orig Fri Dec 16 16:38:16 2011
+++ src/tracker-control/tracker-control-general.c Fri Dec 16 18:02:12 2011
$OpenBSD: patch-src_tracker-control_tracker-control-general_c,v 1.6 2013/03/29 16:28:27 ajacoutot Exp $
--- src/tracker-control/tracker-control-general.c.orig Sun Mar 17 12:35:11 2013
+++ src/tracker-control/tracker-control-general.c Fri Mar 29 16:39:44 2013
@@ -21,6 +21,16 @@
#include <errno.h>
@ -34,7 +34,7 @@ $OpenBSD: patch-src_tracker-control_tracker-control-general_c,v 1.5 2011/12/16 1
static void
log_handler (const gchar *domain,
@@ -643,66 +655,37 @@ tracker_control_general_run (void)
@@ -645,66 +657,37 @@ tracker_control_general_run (void)
if (kill_option != TERM_NONE ||
terminate_option != TERM_NONE ||
list_processes) {
@ -123,7 +123,7 @@ $OpenBSD: patch-src_tracker-control_tracker-control-general_c,v 1.5 2011/12/16 1
str = g_strdup_printf (_("Found process ID %d for '%s'"), pid, basename);
g_print ("%s\n", str);
g_free (str);
@@ -754,14 +737,6 @@ tracker_control_general_run (void)
@@ -756,14 +739,6 @@ tracker_control_general_run (void)
g_free (basename);
}

View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.4 2013/03/29 16:28:27 ajacoutot Exp $
--- tests/libtracker-miner/Makefile.in.orig Mon Mar 18 17:37:38 2013
+++ tests/libtracker-miner/Makefile.in Fri Mar 29 16:39:44 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)
@ -73,7 +73,7 @@ $OpenBSD: patch-tests_libtracker-miner_Makefile_in,v 1.3 2013/02/06 15:54:47 aja
$(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)
@@ -653,7 +644,6 @@ AM_CPPFLAGS = \
@@ -647,7 +638,6 @@ AM_CPPFLAGS = \
LDADD = \
$(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \

View File

@ -1 +0,0 @@
This package provides the (meta-)tracker indexer plugin for evolution.

View File

@ -1 +0,0 @@
This package adds (meta-)tracker "tagging" functionality to nautilus.

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.12 2012/11/10 11:10:42 espie Exp $
@pkgpath ${BASE_PKGPATH}
@comment $OpenBSD: PLIST,v 1.20 2013/03/29 16:28:27 ajacoutot Exp $
@conflict evolution-meta-tracker-*
@conflict nautilus-meta-tracker-*
@pkgpath x11/gnome/tracker,-evolution
@pkgpath x11/gnome/tracker,-nautilus
@bin bin/tracker-control
@bin bin/tracker-explorer
@bin bin/tracker-import
@bin bin/tracker-info
@bin bin/tracker-needle
@ -47,11 +49,12 @@ lib/girepository-1.0/Tracker-${MAJ_V}.typelib
lib/girepository-1.0/TrackerExtract-${MAJ_V}.typelib
lib/girepository-1.0/TrackerMiner-${MAJ_V}.typelib
lib/libtracker-extract-${MAJ_V}.la
@lib lib/libtracker-extract-${MAJ_V}.so.${LIBtracker-extract-0.14_VERSION}
@lib lib/libtracker-extract-${MAJ_V}.so.${LIBtracker-extract-0.16_VERSION}
lib/libtracker-miner-${MAJ_V}.la
@lib lib/libtracker-miner-${MAJ_V}.so.${LIBtracker-miner-0.14_VERSION}
@lib lib/libtracker-miner-${MAJ_V}.so.${LIBtracker-miner-0.16_VERSION}
lib/libtracker-sparql-${MAJ_V}.la
@lib lib/libtracker-sparql-${MAJ_V}.so.${LIBtracker-sparql-0.14_VERSION}
@lib lib/libtracker-sparql-${MAJ_V}.so.${LIBtracker-sparql-0.16_VERSION}
lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so
lib/pkgconfig/tracker-extract-${MAJ_V}.pc
lib/pkgconfig/tracker-miner-${MAJ_V}.pc
lib/pkgconfig/tracker-sparql-${MAJ_V}.pc
@ -84,9 +87,7 @@ lib/tracker-${MAJ_V}/writeback-modules/
lib/tracker-${MAJ_V}/writeback-modules/libwriteback-taglib.so
lib/tracker-${MAJ_V}/writeback-modules/libwriteback-xmp.so
@bin libexec/tracker-extract
@bin libexec/tracker-miner-flickr
@bin libexec/tracker-miner-fs
@bin libexec/tracker-search-bar
@bin libexec/tracker-store
@bin libexec/tracker-writeback
@man man/man1/tracker-control.1
@ -96,7 +97,6 @@ lib/tracker-${MAJ_V}/writeback-modules/libwriteback-xmp.so
@man man/man1/tracker-miner-fs.1
@man man/man1/tracker-needle.1
@man man/man1/tracker-preferences.1
@man man/man1/tracker-search-bar.1
@man man/man1/tracker-search.1
@man man/man1/tracker-sparql.1
@man man/man1/tracker-stats.1
@ -108,17 +108,13 @@ share/applications/tracker-preferences.desktop
share/dbus-1/services/org.freedesktop.Tracker1.Extract.service
share/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service
share/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service
share/dbus-1/services/org.freedesktop.Tracker1.Miner.Flickr.service
share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service
share/dbus-1/services/org.freedesktop.Tracker1.service
share/dbus-1/services/org.gnome.panel.applet.SearchBarFactory.service
share/examples/meta-tracker/
share/examples/meta-tracker/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/meta-tracker/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/meta-tracker/xdg/autostart/tracker-miner-flickr.desktop
@sample ${SYSCONFDIR}/xdg/autostart/tracker-miner-flickr.desktop
share/examples/meta-tracker/xdg/autostart/tracker-miner-fs.desktop
@sample ${SYSCONFDIR}/xdg/autostart/tracker-miner-fs.desktop
share/examples/meta-tracker/xdg/autostart/tracker-store.desktop
@ -134,7 +130,6 @@ share/glib-2.0/schemas/org.freedesktop.Tracker.Store.gschema.xml
share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml
share/glib-2.0/schemas/org.freedesktop.Tracker.enums.xml
share/glib-2.0/schemas/org.freedesktop.Tracker.gschema.xml
share/gnome-panel/4.0/applets/org.gnome.panel.SearchBar.panel-applet
share/gtk-doc/html/libtracker-extract/
share/gtk-doc/html/libtracker-extract/annotation-glossary.html
share/gtk-doc/html/libtracker-extract/ch02.html
@ -281,8 +276,6 @@ share/tracker/extract-rules/15-gstreamer-guess.rule
share/tracker/extract-rules/15-playlist.rule
share/tracker/extract-rules/90-gstreamer-generic.rule
share/tracker/extract-rules/90-text-generic.rule
share/tracker/icons/
share/tracker/icons/tracker-miner-flickr.svg
share/tracker/languages/
share/tracker/languages/stopwords.da
share/tracker/languages/stopwords.de
@ -300,7 +293,6 @@ share/tracker/languages/stopwords.sv
share/tracker/miners/
share/tracker/miners/tracker-miner-applications.desktop
share/tracker/miners/tracker-miner-files.desktop
share/tracker/miners/tracker-miner-flickr.desktop
share/tracker/ontologies/
share/tracker/ontologies/10-xsd.description
share/tracker/ontologies/10-xsd.ontology
@ -343,15 +335,12 @@ share/tracker/ontologies/92-slo.ontology
share/tracker/ontologies/93-libosinfo.description
share/tracker/ontologies/93-libosinfo.ontology
share/tracker/tracker-backup.xml
share/tracker/tracker-explorer.ui
share/tracker/tracker-extract.xml
share/tracker/tracker-miner-web.xml
share/tracker/tracker-miner.xml
share/tracker/tracker-needle.ui
share/tracker/tracker-preferences.ui
share/tracker/tracker-resources.xml
share/tracker/tracker-search-bar-menu.xml
share/tracker/tracker-search-bar.ui
share/tracker/tracker-statistics.xml
share/tracker/tracker-status.xml
share/tracker/tracker-writeback.xml

View File

@ -1,5 +0,0 @@
@comment $OpenBSD: PLIST-evolution,v 1.3 2012/09/28 15:57:27 ajacoutot Exp $
lib/evolution/${EVO_VERSION}/plugins/liborg-freedesktop-Tracker-evolution-plugin.so
lib/evolution/${EVO_VERSION}/plugins/org-freedesktop-Tracker-evolution-plugin.eplug
share/dbus-1/services/org.freedesktop.Tracker1.Miner.EMails.service
share/tracker/miners/tracker-miner-evolution.desktop

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-nautilus,v 1.2 2012/09/28 15:57:27 ajacoutot Exp $
lib/nautilus/extensions-3.0/libnautilus-tracker-tags.so