diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-18 23:57:29 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-21 10:36:54 +0200 |
commit | a04c794b587e207b06465d1eac5e5ea8b1346641 (patch) | |
tree | 5a9a71f1880b72f0119c5bdfd8c7161fa3fb83a4 /meta-oe | |
parent | c794fb0ed62c22c86b2c79db9812a58797208c26 (diff) | |
download | meta-openembedded-contrib-a04c794b587e207b06465d1eac5e5ea8b1346641.tar.gz |
tracker: move from meta-oe to meta-gnome
* it rdepends on gvfs which is available only in meta-gnome and nothing
in meta-oe depends on tracker
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
9 files changed, 0 insertions, 214 deletions
diff --git a/meta-oe/recipes-support/tracker/files/90tracker b/meta-oe/recipes-support/tracker/files/90tracker deleted file mode 100644 index 9594b91689..0000000000 --- a/meta-oe/recipes-support/tracker/files/90tracker +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/usr/bin/trackerd -m & - diff --git a/meta-oe/recipes-support/tracker/files/tracker-dbus.service b/meta-oe/recipes-support/tracker/files/tracker-dbus.service deleted file mode 100644 index c97f49a89d..0000000000 --- a/meta-oe/recipes-support/tracker/files/tracker-dbus.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=tracker DBus session bus handler -Before=tracker-store.service -After=dbus.service -Requires=dbus.service -BindTo=tracker-store.service - -[Service] -Type=forking -EnvironmentFile=-/tmp/tracker.env -ExecStartPre=@BASE_BINDIR@/rm -rf /tmp/tracker.env -ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env' - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service b/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service deleted file mode 100644 index 34d9a1e686..0000000000 --- a/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=tracker-miner-fs -After=syslog.target local-fs.target udev.service dbus.service tracker-store.service -Requires=tracker-store.service - -[Service] -Environment=HOME=/home/root -EnvironmentFile=-/tmp/tracker.env -ExecStart=@LIBEXECDIR@/tracker-miner-fs - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/tracker/files/tracker-store.service b/meta-oe/recipes-support/tracker/files/tracker-store.service deleted file mode 100644 index c5037f3ab9..0000000000 --- a/meta-oe/recipes-support/tracker/files/tracker-store.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=tracker-store -After=syslog.target local-fs.target dbus.service -Requires=dbus.service tracker-dbus.service -BindTo=tracker-dbus.service - -[Service] -EnvironmentFile=-/tmp/tracker.env -ExecStart=@LIBEXECDIR@/tracker-store - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch deleted file mode 100644 index 8701f58547..0000000000 --- a/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur ../tracker-0.10.8/configure.ac tracker-0.10.8//configure.ac ---- ../tracker-0.10.8/configure.ac 2011-04-08 15:03:30.000000000 +0300 -+++ tracker-0.10.8//configure.ac 2011-04-11 13:47:16.625914002 +0300 -@@ -218,7 +218,12 @@ - - # Needed to generate .gir files, - # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport --GOBJECT_INTROSPECTION_CHECK([0.9.5]) -+#GOBJECT_INTROSPECTION_CHECK([0.9.5]) -+# Satisfy missing introspection foo -+AM_CONDITIONAL(HAVE_INTROSPECTION, test "0" == "1") -+ -+INTROSPECTION_CFLAGS="" -+AC_SUBST(INTROSPECTION_CFLAGS) - - # NOTE: dbus and dbus-glib-1 are only used now for libtracker-client - # which is deprecated and tracker-writeback which will be refactored diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch deleted file mode 100644 index 5dadda2a29..0000000000 --- a/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tracker-0.10.17/m4/sqlite-threadsafe.m4 -=================================================================== ---- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4 -+++ tracker-0.10.17/m4/sqlite-threadsafe.m4 -@@ -45,7 +45,7 @@ int main () - ]])], - [ax_cv_sqlite_threadsafe=yes], - [ax_cv_sqlite_threadsafe=no], -- [ax_cv_sqlite_threadsafe=no])]) -+ [ax_cv_sqlite_threadsafe=yes])]) - - LIBS="$save_LIBS" - ]) diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch deleted file mode 100644 index 6c3d9de107..0000000000 --- a/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c -=================================================================== ---- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c 2011-08-03 13:53:16.000000000 +0100 -+++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c 2012-09-10 08:25:18.322215126 +0100 -@@ -20,6 +20,7 @@ - #include "config.h" - - #include <string.h> -+#include <sys/stat.h> - - #include <gio/gio.h> - #include <gio/gunixmounts.h> -@@ -646,6 +647,17 @@ - gchar *content_type; - gboolean is_multimedia; - gboolean is_blank; -+ struct stat st; -+ -+ /* -+ * Consider all files under /media to be -+ * removable unless the file .this-is-root is -+ * present. -+ */ -+ if (!strncmp (mount_path, "/media/", -+ strlen ("/media/")) && -+ stat ("/media/.this-is-root", &st)) -+ is_removable = TRUE; - - content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank); - diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb deleted file mode 100644 index eea8edc9b3..0000000000 --- a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" -DEPENDS = "file gstreamer gamin dbus libexif gettext sqlite3 icu" -RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" -HOMEPAGE = "http://projects.gnome.org/tracker/" - -PR = "r7" - -inherit autotools pkgconfig gnomebase gettext gsettings systemd - -VER_DIR = "${@gnome_verdir("${PV}")}" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ - file://0005-Fix-missing-gobject-introspection-checks.patch \ - file://enable-sqlite-crosscompile.patch \ - file://fix-removable-media-detection.patch \ - file://90tracker \ - file://tracker-store.service \ - file://tracker-miner-fs.service \ - file://tracker-dbus.service \ - " - -SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service " -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OECONF += " tracker_cv_have_ioprio=yes" - -# Disable the desktop-centric miners -EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ - --disable-miner-evolution --disable-miner-flickr" - -LEAD_SONAME = "libtrackerclient.so.0" - -do_install_append() { - cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true -# install -d ${D}/${sysconfdir}/X11/Xsession.d/ -# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/*.service -} - -PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" - -FILES_${PN} += "${datadir}/dbus-1/ \ - ${libdir}/tracker-${VER_DIR}/*.so.* \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \ - ${datadir}/icons/hicolor/*/apps/tracker.* \ - ${libdir}/nautilus/extensions-2.0/*.la \ - ${datadir}/glib-2.0/schemas/* \ - ${systemd_unitdir}/system/tracker-store.service \ - ${systemd_unitdir}/system/tracker-miner-fs.service \ - ${systemd_unitdir}/system/tracker-dbus.service \ -" - -FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \ - ${libdir}/tracker-${VER_DIR}/*.so \ - ${libdir}/tracker-${VER_DIR}/*/*.so \ - ${libdir}/tracker-${VER_DIR}/*/*.la \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.la" - -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/*/*/.debug \ - ${libdir}/*/.debug" -FILES_${PN}-tests = "${datadir}/tracker-tests/" -FILES_${PN}-vala = "${datadir}/vala/" -FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" - -SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" -SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej deleted file mode 100644 index d04482973a..0000000000 --- a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb.rej +++ /dev/null @@ -1,36 +0,0 @@ ---- meta-oe/recipes-support/tracker/tracker_0.14.2.bb -+++ meta-oe/recipes-support/tracker/tracker_0.14.2.bb -@@ -13,7 +13,7 @@ - SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ - file://0005-Fix-missing-gobject-introspection-checks.patch \ - file://enable-sqlite-crosscompile.patch \ -- file://fix-removable-media-detection.patch \ -+ file://fix-removable-media-detection.patch \ - file://90tracker \ - file://tracker-store.service \ - file://tracker-miner-fs.service \ -@@ -32,14 +32,17 @@ - LEAD_SONAME = "libtrackerclient.so.0" - - do_install_append() { -- cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true --# install -d ${D}/${sysconfdir}/X11/Xsession.d/ --# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ -+ cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true -+ # install -d ${D}/${sysconfdir}/X11/Xsession.d/ -+ # install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ - -- install -d ${D}${systemd_unitdir}/system -- install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system -- install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system -- install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system -+ install -d ${D}${systemd_unitdir}/system -+ install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system -+ install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system -+ install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system -+ sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ -+ -e 's,@BASE_BINDIR@,${base_bindir},g' \ -+ ${D}${systemd_unitdir}/system/*.service - } - - PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" |