sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (7b77a2c93586bf2bb6b934b9e8518515ccea6d52)

From: Robin Cook <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (7b77a2c93586bf2bb6b934b9e8518515ccea6d52)
Date: Mon, 26 Feb 2007 21:24:30 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
gnome2-libs/tracker/BUILD | 2 +
gnome2-libs/tracker/CONFIGURE | 13 +++++++++
gnome2-libs/tracker/DEPENDS | 37
++++++++++++++++++---------
gnome2-libs/tracker/DETAILS | 3 --
gnome2-libs/tracker/HISTORY | 8 +++++
gnome2-libs/tracker/PRE_BUILD | 7 +++--
gnome2-libs/tracker/inotify-fix.diff | 10 +++++++
gnome2-libs/tracker/tracker-0.0.4.tar.gz.sig | 0
gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig |binary
10 files changed, 64 insertions(+), 16 deletions(-)

New commits:
commit 7b77a2c93586bf2bb6b934b9e8518515ccea6d52
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

tracker: updated to 0.5.4

diff --git a/gnome2-libs/tracker/BUILD b/gnome2-libs/tracker/BUILD
index feceeab..0670a04 100755
--- a/gnome2-libs/tracker/BUILD
+++ b/gnome2-libs/tracker/BUILD
@@ -1,3 +1,5 @@
+OPTS="--enable-video-extractor=${TRACKER_EXTRACTOR} ${OPTS}" &&
+OPTS="--enable-file-monitoring=${TRACKER_MONITOR} ${OPTS}" &&
make_single &&
default_build &&
make_normal
diff --git a/gnome2-libs/tracker/CONFIGURE b/gnome2-libs/tracker/CONFIGURE
new file mode 100755
index 0000000..72362f3
--- /dev/null
+++ b/gnome2-libs/tracker/CONFIGURE
@@ -0,0 +1,13 @@
+if spell_ok gstreamer; then
+ config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
+ gstreamer xine
+elif spell_ok xine-lib; then
+ config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
+ xine gstreamer
+else
+ config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
+ gstreamer xine
+fi &&
+
+config_query_list TRACKER_MONITOR "Which file monitoring to use?" \
+ inotify fam polling
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 168077c..3bb3299 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -1,14 +1,27 @@
-depends dbus-glib &&
-depends bzip2 &&
-depends zlib &&
-depends libvorbis &&
-depends gtk+2 &&
-depends libextractor &&
-depends mysql &&
-sub_depends mysql embedded &&
+depends dbus-glib &&
+depends bzip2 &&
+depends zlib &&
+depends libpng &&
+depends intltool &&
+depends perl &&
+depends xml-parser-expat &&
+depends pango &&
+depends gtk+2 &&
+depends gnome-vfs2 &&
+depends gnome-utils2 &&
+depends gnome-desktop &&
+depends poppler &&
+depends libexif &&
+depends libgsf &&
+depends sqlite "--enable-external-sqlite" &&

-optional_depends FAM \
- "" \
- "--disable-fam" \
- "Use FAM if inotify not available?"
+if [ "${TRACKER_EXTRACTOR}" == "gstreamer" ]; then
+ depends gstreamer
+elif [ "${TRACKER_EXTRACTOR}" == "xine" ]; then
+ depends xine-lib
+fi &&
+
+if [ "${TRACKER_MONITOR}" == "fam" ]; then
+ depends FAM
+fi

diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index 8725b50..3fdb081 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -1,5 +1,5 @@
SPELL=tracker
- VERSION=0.0.4
+ VERSION=0.5.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gnome.org/~jamiemcc/${SPELL}/${SOURCE}
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
LICENSE[0]=GPL
WEB_SITE=http://freedesktop.org/wiki/Software/Tracker
ENTERED=20060524
- PATCHLEVEL=1
KEYWORDS="search gnome2 libs"
SHORT="Metadata database and indexer framework"
cat << EOF
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index 8699423..050c595 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,11 @@
+2007-02-24 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.5.4
+ * DEPENDS: added new depends
+ removed mysql
+ * PRE_BUILD: apply patch to fix the inotify build
+ * CONFIGURE: added
+ * BUILD: set OPTS by configure queries
+
2006-07-27 Flavien Bridault <vlaaad AT sourcemage.org>
* DEPENDS: now depends on dbus-glib instead of dbus
* DETAILS: PATCHLEVEL++
diff --git a/gnome2-libs/tracker/PRE_BUILD b/gnome2-libs/tracker/PRE_BUILD
index 7400c5b..69b200e 100755
--- a/gnome2-libs/tracker/PRE_BUILD
+++ b/gnome2-libs/tracker/PRE_BUILD
@@ -1,5 +1,8 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/inotify-fix.diff &&
+
# Fix for dbus 0.9X
sedit "s/dbus_connection_disconnect/dbus_connection_close/" \
src/trackerd/tracker-dbus.c
diff --git a/gnome2-libs/tracker/inotify-fix.diff
b/gnome2-libs/tracker/inotify-fix.diff
new file mode 100644
index 0000000..8a71094
--- /dev/null
+++ b/gnome2-libs/tracker/inotify-fix.diff
@@ -0,0 +1,10 @@
+--- src/trackerd/tracker-inotify.c.orig 2007-02-26 20:20:57.000000000
-0600
++++ src/trackerd/tracker-inotify.c 2007-02-26 20:21:18.000000000 -0600
+@@ -21,6 +21,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
++#include <unistd.h>
+
+ #include "tracker-inotify.h"
+
diff --git a/gnome2-libs/tracker/tracker-0.0.4.tar.gz.sig
b/gnome2-libs/tracker/tracker-0.0.4.tar.gz.sig
deleted file mode 100644
index 3dd08c6..0000000
Binary files a/gnome2-libs/tracker/tracker-0.0.4.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
b/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
new file mode 100644
index 0000000..b036195
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.5.4.tar.gz.sig
differ

[SM-Commit] GIT changes to master grimoire by Robin Cook (7b77a2c93586bf2bb6b934b9e8518515ccea6d52), Robin Cook, 02/26/2007