packages: kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch - resolve conflicts with o...

[glen]

Author: glen                         Date: Mon Feb 15 14:10:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve conflicts with other patches

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

---- Diffs:

================================================================
Index: packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch
diff -u packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch:1.1 packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch:1.2
--- packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch:1.1	Mon Feb 15 15:07:06 2010
+++ packages/kdelibs/kdelibs-3.5.10-gcc_4.4-2.patch	Mon Feb 15 15:10:12 2010
@@ -5,27 +5,6 @@
 Upstream Status: Unknown
 Description: Fix compilation with gcc-4.4
 
-diff -up kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig kdelibs-3.5.10/kioslave/ftp/ftp.cc
---- kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig	2009-02-25 13:18:13.000000000 +0100
-+++ kdelibs-3.5.10/kioslave/ftp/ftp.cc	2009-02-25 13:34:13.000000000 +0100
-@@ -876,7 +876,7 @@ int Ftp::ftpOpenPASVDataConnection()
-   // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
-   // but anonftpd gives '227 =160,39,200,55,6,245'
-   int i[6];
--  char *start = strchr(ftpResponse(3), '(');
-+  const char *start = strchr(ftpResponse(3), '(');
-   if ( !start )
-     start = strchr(ftpResponse(3), '=');
-   if ( !start ||
-@@ -931,7 +931,7 @@ int Ftp::ftpOpenEPSVDataConnection()
-     return ERR_INTERNAL;
-   }
- 
--  char *start = strchr(ftpResponse(3), '|');
-+  const char *start = strchr(ftpResponse(3), '|');
-   if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
-     return ERR_INTERNAL;
- 
 --- kdelibs-3.5.10/kjs/dtoa.cpp.orig	2009-05-26 17:20:54.673539511 +0200
 +++ kdelibs-3.5.10/kjs/dtoa.cpp	2009-05-26 17:24:20.117023777 +0200
 @@ -207,11 +207,7 @@ typedef unsigned Long ULong;
@@ -480,42 +459,3 @@
  		/* set sign for everything, including 0's and NaNs */
  		*sign = 1;
 
---- kdelibs-3.5.10/admin/cvs.sh~	2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh	2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
-     echo "*** KDE requires automake $required_automake_version"
-     exit 1
-     ;;
--  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
-+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
-     echo "*** $AUTOMAKE_STRING found."
-     UNSERMAKE=no
-     ;;
-
-diff -Naurp kdelibs-3.5.10/kio/kio/kdirwatch.cpp kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp
---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp	2006-07-22 10:16:37.000000000 +0200
-+++ kdelibs-3.5.10-p/kio/kio/kdirwatch.cpp	2009-02-26 00:45:49.000000000 +0100
-@@ -71,22 +71,8 @@
- #include <linux/types.h>
- // Linux kernel headers are documented to not compile
- #define _S390_BITOPS_H
--#include <linux/inotify.h>
-+#include <sys/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 
================================================================

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