Author: glen Date: Mon Feb 15 14:19:26 2010 GMT Module: packages Tag: HEAD ---- Log message: - raw from http://svn.cross-lfs.org/svn/repos/patches/kdepim/kdepim-3.5.10-gcc_4.4-2.patch
---- Files affected: packages/kdepim: kdepim-3.5.10-gcc_4.4-2.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch diff -u /dev/null packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch:1.1 --- /dev/null Mon Feb 15 15:19:26 2010 +++ packages/kdepim/kdepim-3.5.10-gcc_4.4-2.patch Mon Feb 15 15:19:21 2010 @@ -0,0 +1,79 @@ +Submitted By: Michael (rabenkind at selfservix dot org) +Date: 2009-07-15 +Initial Package Version: 3.5.10 +Origin: http://forum.kde.org.pl/viewtopic.php?id=2981 +Upstream Status: Unknown +Description: Fix compilation with gcc-4.4 + +--- kdepim-3.5.10/indexlib/memvector.tcc 2009-07-15 17:31:27.000000000 +0200 ++++ kdepim-3.5.10/indexlib/memvector.tcc 2009-07-15 17:35:54.000000000 +0200 +@@ -30,10 +30,11 @@ + void memvector<T>::resize( size_type n_s ) { + if ( size() >= n_s ) return; + +- data_->resize( n_s * byte_io::byte_lenght<value_type>() + byte_io::byte_lenght<unsigned>() ); ++ using namespace byte_io; ++ data_->resize( n_s * byte_lenght<value_type>() + byte_lenght<unsigned>() ); if ( size() >= n_s ) return; + iterator p_end = end(); +- byte_io::write<unsigned>( data_->rw_base( 0 ), n_s ); +- while ( operator !=<unsigned, unsigned>(p_end, end()) ) { ++ write<unsigned>( data_->rw_base( 0 ), n_s ); ++ while ( p_end != end() ) { + *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> ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
