Am Wednesday 15 July 2009 20:38:27 schrieb Michael: > Hi out there! > > Collected some patches to compile kde-3.5.10 with gcc-4.4. > > The first three patch without problems but the fourth i could't get to > work. I even worked the out fourth by hand but the first part patching > memvector.tcc need some revision by someone.
I redo the patch for kdepim and now it will apply fine. Should i bump up the version of that patch now? Joe advised me to correct some descriptions of my earlier patches, how can i do that? Simply uploading them again didn't work. How can i edit them? Uploading the patches mainstream isn't possible cause kde-3 is no longer maintained. So what's the right description for the field upstream status? Greetings Michael As always sorry for my bad grammar.
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/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> --- kdepim-3.5.10/indexlib/memvector.tcc~ 2009-07-16 08:36:47.000000000 +0200 +++ kdepim-3.5.10/indexlib/memvector.tcc 2009-07-16 08:39:00.000000000 +0200 @@ -30,11 +30,12 @@ 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()) ) { - *p_end = value_type(); + write<unsigned>( data_->rw_base( 0 ), n_s ); + while ( p_end != end() ) { + *p_end = value_type(); ++p_end; }
_______________________________________________ Clfs-dev mailing list [email protected] http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
