Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire

6 files changed, 91 insertions, 0 deletions

diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 0bccf2bace..af0d4f30eb 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2009-02-18 Thomas Orgis <sobukus@sourcemage.org>
+	* PRE_BUILD, inotify.patch: fix build; bad kernel header usage
+
 2009-01-08 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* DEPENDS: added hspell #12652
 
diff --git a/kde-core/kdelibs/PRE_BUILD b/kde-core/kdelibs/PRE_BUILD
new file mode 100755
index 0000000000..38085cb4af
--- /dev/null
+++ b/kde-core/kdelibs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np0 < "$SCRIPT_DIRECTORY/inotify.patch"
diff --git a/kde-core/kdelibs/inotify.patch b/kde-core/kdelibs/inotify.patch
new file mode 100644
index 0000000000..5052aebf1e
--- /dev/null
+++ b/kde-core/kdelibs/inotify.patch
@@ -0,0 +1,42 @@
+--- kio/kio/kdirwatch.cpp.orig	2009-01-18 17:29:23.000000000 +0100
++++ kio/kio/kdirwatch.cpp	2009-01-18 17:31:03.000000000 +0100
+@@ -68,38 +68,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+-#include <linux/types.h>
+-// Linux kernel headers are documented to not compile
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
+-
+-static inline int inotify_init (void)
+-{
+-  return syscall (__NR_inotify_init);
+-}
+-
+-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
+-{
+-  return syscall (__NR_inotify_add_watch, fd, name, mask);
+-}
+-
+-static inline int inotify_rm_watch (int fd, __u32 wd)
+-{
+-  return syscall (__NR_inotify_rm_watch, fd, wd);
+-}
+-
+-#ifndef  IN_ONLYDIR
+-#define  IN_ONLYDIR 0x01000000 
+-#endif
+-
+-#ifndef IN_DONT_FOLLOW
+-#define IN_DONT_FOLLOW 0x02000000
+-#endif
+-
+-#ifndef IN_MOVE_SELF
+-#define IN_MOVE_SELF 0x00000800
+-#endif
+-
++#include <sys/inotify.h>
+ #endif
+ 
+ #include <sys/utsname.h>
diff --git a/kde-core/kdepim/HISTORY b/kde-core/kdepim/HISTORY
index bfad40d7d7..6d79d5ccb1 100644
--- a/kde-core/kdepim/HISTORY
+++ b/kde-core/kdepim/HISTORY
@@ -1,3 +1,6 @@
+2009-02-18 Thomas Orgis <sobukus@sourcemage.org>
+	* PRE_BUILD, inotify.patch: fix build; bad kernel header usage
+
 2008-08-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* DETAILS: updated spell to 3.5.10
 
diff --git a/kde-core/kdepim/PRE_BUILD b/kde-core/kdepim/PRE_BUILD
new file mode 100755
index 0000000000..b371357e5a
--- /dev/null
+++ b/kde-core/kdepim/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/inotify.patch"
diff --git a/kde-core/kdepim/inotify.patch b/kde-core/kdepim/inotify.patch
new file mode 100644
index 0000000000..a199e6c483
--- /dev/null
+++ b/kde-core/kdepim/inotify.patch
@@ -0,0 +1,37 @@
+diff -ru kdepim-3.5.10/kmail/editorwatcher.cpp kdepim-3.5.10.inotify/kmail/editorwatcher.cpp
+--- kdepim-3.5.10/kmail/editorwatcher.cpp	2008-02-13 10:39:37.000000000 +0100
++++ kdepim-3.5.10.inotify/kmail/editorwatcher.cpp	2009-02-18 15:18:49.000000000 +0100
+@@ -32,30 +32,14 @@
+ #include <cassert>
+ 
+ // inotify stuff taken from kdelibs/kio/kio/kdirwatch.cpp
++// fixed for linux header usage
+ #ifdef HAVE_INOTIFY
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+-#include <linux/types.h>
+-// Linux kernel headers are documented to not compile
+-#define _S390_BITOPS_H
+-#include <linux/inotify.h>
+-
+-static inline int inotify_init (void)
+-{
+-  return syscall (__NR_inotify_init);
+-}
+-
+-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
+-{
+-  return syscall (__NR_inotify_add_watch, fd, name, mask);
+-}
+-
+-static inline int inotify_rm_watch (int fd, __u32 wd)
+-{
+-  return syscall (__NR_inotify_rm_watch, fd, wd);
+-}
++#include <sys/types.h>
++#include <sys/inotify.h>
+ #endif
+ 
+ using namespace KMail;