packages: kdepim/kdepim-3.5.10-gcc_4.4-2.patch - remove chunks present in k...

[glen]

Author: glen                         Date: Mon Feb 15 14:26:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove chunks present in kdepim-inotify.patch

---- Files affected:
packages/kdepim:
   kdepim-3.5.10-gcc_4.4-2.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch
diff -u packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch:1.2 packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch:1.3
--- packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch:1.2	Mon Feb 15 15:25:20 2010
+++ packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch	Mon Feb 15 15:26:48 2010
@@ -22,58 +22,3 @@
  		*p_end = value_type();
  		++p_end;
  		
---- kdepim-3.5.10/kmail/editorwatcher.cpp
-+++ kdepim-3.5.10/kmail/editorwatcher.cpp
-@@ -39,27 +39,11 @@
- #elif HAVE_INOTIFY
- #include <sys/ioctl.h>
- #include <unistd.h>
--#include <fcntl.h>
-+#include <sys/inotify.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);
--}
- #endif
-
- using namespace KMail;
-
-diff -Naur kdepim-3.5.10/libkdenetwork/libgpgme-copy/assuan/funopen.c kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/assuan/funopen.c
---- kdepim-3.5.10/libkdenetwork/libgpgme-copy/assuan/funopen.c	2007-05-14 09:54:40.000000000 +0200
-+++ kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/assuan/funopen.c	2009-02-27 03:34:44.000000000 +0100
-@@ -18,6 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-  * USA. 
-  */
-+#define HAVE_FOPENCOOKIE
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-
-diff -Naur kdepim-3.5.10/libkdenetwork/libgpgme-copy/gpgme/funopen.c kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/gpgme/funopen.c
---- kdepim-3.5.10/libkdenetwork/libgpgme-copy/gpgme/funopen.c	2007-05-14 09:54:40.000000000 +0200
-+++ kdepim-3.5.10-p/libkdenetwork/libgpgme-copy/gpgme/funopen.c	2009-02-27 03:34:44.000000000 +0100
-@@ -17,6 +17,7 @@
-    License along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-    02111-1307, USA.  */
-+#define HAVE_FOPENCOOKIE
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch?r1=1.2&r2=1.3&f=u