Hello community,
here is the log from the commit of package kdepim3 for openSUSE:Factory checked
in at 2011-12-13 11:48:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old)
and /work/SRC/openSUSE:Factory/.kdepim3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim3", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2011-12-02
13:21:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2011-12-13
11:48:52.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Dec 13 02:03:25 UTC 2011 - an...@opensuse.org
+
+- add patch from Slackware KDE3 repository to fix kmail crash when
+ building with gcc-4.6
+
+-------------------------------------------------------------------
New:
----
kdepim-pardus-kmail-imapfetchmaxsize.patch
kdepim-slackware-kmail-composer-crash-fix.patch
kdepim-trinity-editorwatcher-crash-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.e9B6eg/_old 2011-12-13 11:48:57.000000000 +0100
+++ /var/tmp/diff_new_pack.e9B6eg/_new 2011-12-13 11:48:57.000000000 +0100
@@ -58,6 +58,9 @@
Patch128: kdepim-trinity-fix-include.diff
Patch129: kdepim-gcc-fix-call1.patch
Patch130: kdepim-gcc-fix-call2.patch
+Patch131: kdepim-trinity-editorwatcher-crash-fix.patch
+Patch132: kdepim-pardus-kmail-imapfetchmaxsize.patch
+Patch133: kdepim-slackware-kmail-composer-crash-fix.patch
Provides: cryptplug
Obsoletes: cryptplug
# authentification plugins can be useful
@@ -247,10 +250,15 @@
%patch128 -p1
%patch129 -p1
%patch130 -p1
+%patch131 -p3
+%patch132 -p1
+%patch133 -p1
+
. /etc/opt/kde3/common_options
update_admin
%build
+
. /etc/opt/kde3/common_options
export CXXFLAGS="$CXXFLAGS -Wl,--add-needed"
configopts="--disable-final"
++++++ kdepim-gcc44-fix.patch ++++++
--- /var/tmp/diff_new_pack.e9B6eg/_old 2011-12-13 11:48:57.000000000 +0100
+++ /var/tmp/diff_new_pack.e9B6eg/_new 2011-12-13 11:48:57.000000000 +0100
@@ -11,7 +11,7 @@
iterator p_end = end();
- byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
- while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
-+ write( data_->rw_base( 0 ), n_s );
++ write<unsigned>( data_->rw_base( 0 ), n_s );
+ while ( p_end != end() ) {
*p_end = value_type();
++p_end;
++++++ kdepim-pardus-kmail-imapfetchmaxsize.patch ++++++
--- kdepim-3.4.0.orig/kmail/kmfolderimap.cpp 2005-02-23 13:08:52.000000000
+0200
+++ kdepim-3.4.0/kmail/kmfolderimap.cpp 2005-03-22 21:10:50.000000000 +0200
@@ -77,6 +77,14 @@
connect (this, SIGNAL( folderComplete( KMFolderImap*, bool ) ),
this, SLOT( slotCompleteMailCheckProgress()) );
+
+
+ KConfig *config = new KConfig ("kmailrc");
+ config->setGroup("General");
+
+ fetchMaxSize = config->readNumEntry("ImapFetchMaxSize", 5000);
+
+ delete config;
}
KMFolderImap::~KMFolderImap()
--- kdepim-3.4.0.orig/kmail/kmfolderimap.h 2005-02-04 01:12:07.000000000
+0200
+++ kdepim-3.4.0/kmail/kmfolderimap.h 2005-03-22 21:10:50.000000000 +0200
@@ -530,6 +530,7 @@
ProgressItem *mAddMessageProgressItem;
// to-be-added folders
QStringList mFoldersPendingCreation;
+ int fetchMaxSize;
// push all flags to the server instead of just the changed once
// when doing a flag change the next time
--- kdepim-3.5.6/kmail/kmfolderimap.cpp 2007-04-15 23:14:02.000000000 +0300
+++ kdepim-3.5.6/kmail/kmfolderimap.cpp 2007-04-15 23:18:03.000000000 +0300
@@ -1635,7 +1635,7 @@
KMFolderImap* kmfi = folder? dynamic_cast<KMFolderImap*>(folder->storage())
: 0;
if ( jt == FolderJob::tGetMessage && partSpecifier == "STRUCTURE" &&
account() && account()->loadOnDemand() &&
- ( msg->msgSizeServer() > 5000 || msg->msgSizeServer() == 0 ) &&
+ ( msg->msgSizeServer() > fetchMaxSize || msg->msgSizeServer() == 0 ) &&
( msg->signatureState() == KMMsgNotSigned ||
msg->signatureState() == KMMsgSignatureStateUnknown ) &&
( msg->encryptionState() == KMMsgNotEncrypted ||
++++++ kdepim-slackware-kmail-composer-crash-fix.patch ++++++
diff -r -u kdepim-3.5.10.orig/kmail/kmcomposewin.cpp
kdepim-3.5.10/kmail/kmcomposewin.cpp
--- kdepim-3.5.10.orig/kmail/kmcomposewin.cpp 2008-08-19 21:15:47.000000000
+0300
+++ kdepim-3.5.10/kmail/kmcomposewin.cpp 2010-07-28 22:21:15.000000000
+0300
@@ -155,7 +155,7 @@
//-----------------------------------------------------------------------------
KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
- : MailComposerIface(), KMail::Composer( "kmail-composer#" ),
+ : /*MailComposerIface(),*/ KMail::Composer( "kmail-composer#" ),
mSpellCheckInProgress( false ),
mDone( false ),
mAtmModified( false ),
diff -r -u kdepim-3.5.10.orig/kmail/kmcomposewin.h
kdepim-3.5.10/kmail/kmcomposewin.h
--- kdepim-3.5.10.orig/kmail/kmcomposewin.h 2008-08-19 21:15:47.000000000
+0300
+++ kdepim-3.5.10/kmail/kmcomposewin.h 2010-07-28 22:20:57.000000000 +0300
@@ -95,7 +95,7 @@
}
//-----------------------------------------------------------------------------
-class KMComposeWin : public KMail::Composer, virtual public MailComposerIface
+class KMComposeWin : public KMail::Composer //, virtual public
MailComposerIface
{
Q_OBJECT
friend class ::KMEdit;
@@ -107,8 +107,8 @@
public:
static Composer * create( KMMessage * msg = 0, uint identity = 0 );
- MailComposerIface * asMailComposerIFace() { return this; }
- const MailComposerIface * asMailComposerIFace() const { return this; }
+ MailComposerIface * asMailComposerIFace() { return /*this*/ 0; }
+ const MailComposerIface * asMailComposerIFace() const { return /*this*/ 0; }
public: // mailserviceimpl
/**
++++++ kdepim-trinity-editorwatcher-crash-fix.patch ++++++
--- branches/trinity/kdepim/kmail/editorwatcher.cpp 2009/12/16 01:32:26
1062790
+++ branches/trinity/kdepim/kmail/editorwatcher.cpp 2009/12/16 01:50:36
1062791
@@ -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;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
