Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (938d88a7e9cb700f14b1ac807c1f335a9deb3dad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (938d88a7e9cb700f14b1ac807c1f335a9deb3dad)
  • Date: Sat, 3 Mar 2007 14:31:59 -0600

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

gnome2-libs/tracker/DEPENDS | 2
gnome2-libs/tracker/HISTORY | 5 +
gnome2-libs/tracker/inotify-fix.diff | 135
++++++++++++++++++++++++++++++++++-
3 files changed, 139 insertions(+), 3 deletions(-)

New commits:
commit 938d88a7e9cb700f14b1ac807c1f335a9deb3dad
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

tracker: fixed inotify support

diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 3bb3299..61db2e5 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -8,7 +8,7 @@ depends xml-parser-expat
depends pango &&
depends gtk+2 &&
depends gnome-vfs2 &&
-depends gnome-utils2 &&
+depends gmime &&
depends gnome-desktop &&
depends poppler &&
depends libexif &&
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index 050c595..d1714f4 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,8 @@
+2007-03-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed gnome-utils2, added gmime
+ * inotify-fix.diff: added more fixes so the inotify support not only
+ compiles, but also starts
+
2007-02-24 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.5.4
* DEPENDS: added new depends
diff --git a/gnome2-libs/tracker/inotify-fix.diff
b/gnome2-libs/tracker/inotify-fix.diff
index 8a71094..90cd8a0 100644
--- a/gnome2-libs/tracker/inotify-fix.diff
+++ b/gnome2-libs/tracker/inotify-fix.diff
@@ -1,5 +1,123 @@
---- 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
+diff -Nur src/trackerd/inotify.h
../tracker-0.5.4-fixed/src/trackerd/inotify.h
+--- src/trackerd/inotify.h 1970-01-01 01:00:00.000000000 +0100
++++ ../tracker-0.5.4-fixed/src/trackerd/inotify.h 2007-03-03
20:49:56.000000000 +0100
+@@ -0,0 +1,113 @@
++/*
++ * Inode based directory notification for Linux
++ *
++ * Copyright (C) 2005 John McCutchan
++ */
++
++#ifndef _LINUX_INOTIFY_H
++#define _LINUX_INOTIFY_H
++
++#include <linux/types.h>
++
++/*
++ * struct inotify_event - structure read from the inotify device for each
event
++ *
++ * When you are watching a directory, you will receive the filename for
events
++ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
++ */
++struct inotify_event {
++ __s32 wd; /* watch descriptor */
++ __u32 mask; /* watch mask */
++ __u32 cookie; /* cookie to synchronize two events */
++ __u32 len; /* length (including nulls) of name */
++ char name[0]; /* stub for possible name */
++};
++
++/* the following are legal, implemented events that user-space can watch
for */
++#define IN_ACCESS 0x00000001 /* File was accessed */
++#define IN_MODIFY 0x00000002 /* File was modified */
++#define IN_ATTRIB 0x00000004 /* Metadata changed */
++#define IN_CLOSE_WRITE 0x00000008 /* Writtable file was
closed */
++#define IN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */
++#define IN_OPEN 0x00000020 /* File was opened */
++#define IN_MOVED_FROM 0x00000040 /* File was moved from X */
++#define IN_MOVED_TO 0x00000080 /* File was moved to Y */
++#define IN_CREATE 0x00000100 /* Subfile was created */
++#define IN_DELETE 0x00000200 /* Subfile was deleted */
++#define IN_DELETE_SELF 0x00000400 /* Self was deleted */
++#define IN_MOVE_SELF 0x00000800 /* Self was moved */
++
++/* the following are legal events. they are sent as needed to any watch */
++#define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */
++#define IN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */
++#define IN_IGNORED 0x00008000 /* File was ignored */
++
++/* helper events */
++#define IN_CLOSE (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close
*/
++#define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) /*
moves */
++
++/* special flags */
++#define IN_ONLYDIR 0x01000000 /* only watch the path if it
is a directory */
++#define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym
link */
++#define IN_MASK_ADD 0x20000000 /* add to the mask of an
already existing watch */
++#define IN_ISDIR 0x40000000 /* event occurred against dir
*/
++#define IN_ONESHOT 0x80000000 /* only send event once */
++
++/*
++ * All of the events - we build the list by hand so that we can add flags in
++ * the future and not break backward compatibility. Apps will get only the
++ * events that they originally wanted. Be sure to add new events here!
++ */
++#define IN_ALL_EVENTS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE |
\
++ IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
++ IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF
| \
++ IN_MOVE_SELF)
++
++#ifdef __KERNEL__
++
++#include <linux/dcache.h>
++#include <linux/fs.h>
++#include <linux/config.h>
++
++#ifdef CONFIG_INOTIFY
++
++extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
++ const char *);
++extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
++ const char *);
++extern void inotify_unmount_inodes(struct list_head *);
++extern void inotify_inode_is_dead(struct inode *);
++extern u32 inotify_get_cookie(void);
++
++#else
++
++static inline void inotify_inode_queue_event(struct inode *inode,
++ __u32 mask, __u32 cookie,
++ const char *filename)
++{
++}
++
++static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
++ __u32 mask, __u32 cookie,
++ const char *filename)
++{
++}
++
++static inline void inotify_unmount_inodes(struct list_head *list)
++{
++}
++
++static inline void inotify_inode_is_dead(struct inode *inode)
++{
++}
++
++static inline u32 inotify_get_cookie(void)
++{
++ return 0;
++}
++
++#endif /* CONFIG_INOTIFY */
++
++#endif /* __KERNEL __ */
++
++#endif /* _LINUX_INOTIFY_H */
+diff -Nur src/trackerd/tracker-inotify.c
../tracker-0.5.4-fixed/src/trackerd/tracker-inotify.c
+--- src/trackerd/tracker-inotify.c 2007-01-26 01:15:10.000000000 +0100
++++ ../tracker-0.5.4-fixed/src/trackerd/tracker-inotify.c 2007-03-03
20:51:02.000000000 +0100
@@ -21,6 +21,7 @@
#include <string.h>
#include <glib.h>
@@ -8,3 +126,16 @@

#include "tracker-inotify.h"

+diff -Nur src/trackerd/tracker-inotify.h
../tracker-0.5.4-fixed/src/trackerd/tracker-inotify.h
+--- src/trackerd/tracker-inotify.h 2007-01-26 01:15:10.000000000 +0100
++++ ../tracker-0.5.4-fixed/src/trackerd/tracker-inotify.h 2007-03-03
20:47:13.000000000 +0100
+@@ -28,7 +28,8 @@
+ # include <linux/inotify.h>
+ # include "linux-inotify-syscalls.h"
+ #else
+-# include <sys/inotify.h>
++# include "inotify.h"
++# include "linux-inotify-syscalls.h"
+ #endif
+
+ #include "tracker-db.h"



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (938d88a7e9cb700f14b1ac807c1f335a9deb3dad), Arwed von Merkatz, 03/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page