aboutsummaryrefslogtreecommitdiff
path: root/deskutils/kdepim44
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/kdepim44')
-rw-r--r--deskutils/kdepim44/distinfo6
-rw-r--r--deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc22
-rw-r--r--deskutils/kdepim44/files/patch-post-3.5.0-kmail211
3 files changed, 3 insertions, 236 deletions
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index e00ad639d113..083a6748d9f7 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.0.tar.bz2) = e19a2a40e422ecd483884ce6e9ac8925
-SHA256 (KDE/kdepim-3.5.0.tar.bz2) = d7e3aa6783275df1ace9c3ab5164afd9017067bd9006b7af722fbe89062033c4
-SIZE (KDE/kdepim-3.5.0.tar.bz2) = 12865623
+MD5 (KDE/kdepim-3.5.1.tar.bz2) = 8e87c9cbe1f0c0f983f94d804a5bc8f9
+SHA256 (KDE/kdepim-3.5.1.tar.bz2) = 7705986fbfe8036ca1ead6c0e360a39325057bb3adb676c80b454619710b0995
+SIZE (KDE/kdepim-3.5.1.tar.bz2) = 12885355
diff --git a/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc b/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc
deleted file mode 100644
index 7da32fe405fb..000000000000
--- a/deskutils/kdepim44/files/patch-kioslaves_mbox-readmbox.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslaves/mbox/readmbox.cc.orig Sun Dec 18 15:43:49 2005
-+++ kioslaves/mbox/readmbox.cc Sun Dec 18 15:58:15 2005
-@@ -16,6 +16,8 @@
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-+#include <config.h>
-+
- #include "readmbox.h"
-
- #include "mbox.h"
-@@ -28,6 +30,10 @@
- #include <qfileinfo.h>
- #include <qstring.h>
- #include <qtextstream.h>
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-
- #include <utime.h>
-
diff --git a/deskutils/kdepim44/files/patch-post-3.5.0-kmail b/deskutils/kdepim44/files/patch-post-3.5.0-kmail
deleted file mode 100644
index 6e0112c92e74..000000000000
--- a/deskutils/kdepim44/files/patch-post-3.5.0-kmail
+++ /dev/null
@@ -1,211 +0,0 @@
-Index: kmcommands.cpp
-===================================================================
---- kmail/kmcommands.cpp (Revision 487211)
-+++ kmail/kmcommands.cpp (Arbeitskopie)
-@@ -1496,30 +1496,30 @@
-
- void KMMetaFilterActionCommand::start()
- {
--#if 0 // use action scheduler
-- KMFilterMgr::FilterSet set = KMFilterMgr::All;
-- QPtrList<KMFilter> filters;
-- filters.append( mFilter );
-- ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
-- scheduler->setAlwaysMatch( true );
-- scheduler->setAutoDestruct( true );
-+ if (ActionScheduler::isEnabled() ) {
-+ // use action scheduler
-+ KMFilterMgr::FilterSet set = KMFilterMgr::All;
-+ QValueList<KMFilter*> filters;
-+ filters.append( mFilter );
-+ ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
-+ scheduler->setAlwaysMatch( true );
-+ scheduler->setAutoDestruct( true );
-
-- int contentX, contentY;
-- HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
-- QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
-- mHeaders->finalizeMove( nextItem, contentX, contentY );
-+ int contentX, contentY;
-+ HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
-+ QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
-+ mHeaders->finalizeMove( nextItem, contentX, contentY );
-
--
-- for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
-- scheduler->execFilters( msg );
--#else
-- KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
-- *mHeaders->selectedMsgs(), mFilter);
-- filterCommand->start();
-- int contentX, contentY;
-- HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
-- mHeaders->finalizeMove( item, contentX, contentY );
--#endif
-+ for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
-+ scheduler->execFilters( msg );
-+ } else {
-+ KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
-+ *mHeaders->selectedMsgs(), mFilter);
-+ filterCommand->start();
-+ int contentX, contentY;
-+ HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
-+ mHeaders->finalizeMove( item, contentX, contentY );
-+ }
- }
-
- FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
-Index: kmkernel.cpp
-===================================================================
---- kmail/kmkernel.cpp (Revision 487211)
-+++ kmail/kmkernel.cpp (Arbeitskopie)
-@@ -1432,11 +1432,11 @@
- the_msgIndex = 0;
- #endif
-
--#if 0
-+//#if 0
- the_weaver = new KPIM::ThreadWeaver::Weaver( this );
- the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this);
- the_weaverLogger->attach (the_weaver);
--#endif
-+//#endif
-
- connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ),
- this, SIGNAL( folderRemoved(KMFolder*) ) );
-Index: kmfilteraction.cpp
-===================================================================
---- kmail/kmfilteraction.cpp (Revision 487211)
-+++ kmail/kmfilteraction.cpp (Arbeitskopie)
-@@ -1617,6 +1617,9 @@
- FILE *p;
- QByteArray ba;
-
-+ // backup the serial number in case the header gets lost
-+ QString origSerNum = mMsg->headerField( "X-KMail-Filtered" );
-+
- p = popen(QFile::encodeName(mCmd), "r");
- int len =100;
- char buffer[100];
-@@ -1630,7 +1633,20 @@
- pclose(p);
- if ( !ba.isEmpty() ) {
- KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() );
-+ KMFolder *filterFolder = mMsg->parent();
-+ ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
-+
- mMsg->fromByteArray( ba );
-+ if ( !origSerNum.isEmpty() )
-+ mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
-+ if ( filterFolder && handler ) {
-+ bool oldStatus = handler->ignoreChanges( true );
-+ filterFolder->take( filterFolder->find( mMsg ) );
-+ filterFolder->addMsg( mMsg );
-+ handler->ignoreChanges( oldStatus );
-+ } else {
-+ kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
-+ }
- }
-
- KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" );
-Index: actionscheduler.h
-===================================================================
---- kmail/actionscheduler.h (Revision 487211)
-+++ kmail/actionscheduler.h (Arbeitskopie)
-@@ -77,10 +77,10 @@
- of messages left to process is empty */
- void setFilterList( QValueList<KMFilter*> filters );
-
-- /* Set the id of the account associated with this scheduler */
-+ /** Set the id of the account associated with this scheduler */
- void setAccountId( uint id ) { mAccountId = id; mAccount = true; }
-
-- /* Clear the id of the account associated with this scheduler */
-+ /** Clear the id of the account associated with this scheduler */
- void clearAccountId() { mAccountId = 0; mAccount = false; }
-
- /** Queue a message for filtering */
-@@ -88,9 +88,16 @@
- void execFilters(const QPtrList<KMMsgBase> msgList);
- void execFilters(KMMsgBase* msgBase);
- void execFilters(Q_UINT32 serNum);
-+
- static QString debug();
- static bool isEnabled();
-
-+ /** Allow or deny manipulations on the message to be filtered.
-+ This is needed when using pipe-through filters, because the
-+ changes made by the filter have to be written back.
-+ The old value before applying the new value is returned. */
-+ bool ignoreChanges( bool ignore );
-+
- signals:
- /** Emitted when filtering is completed */
- void result(ReturnCode);
-Index: actionscheduler.cpp
-===================================================================
---- kmail/actionscheduler.cpp (Revision 487211)
-+++ kmail/actionscheduler.cpp (Arbeitskopie)
-@@ -570,7 +570,7 @@
- (!mAccount ||
- (mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) ||
- ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) {
--
-+
- // filter is applicable
- if ( FilterLog::instance()->isLogging() ) {
- QString logText( i18n( "<b>Evaluating filter rules:</b> " ) );
-@@ -646,8 +646,11 @@
- if (!orgMsg || !orgMsg->parent()) {
- // Original message is gone, no point filtering it anymore
- mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
-+ kdDebug(5006) << "The original serial number is missing. "
-+ << "Cannot complete the filtering." << endl;
- mExecutingLock = false;
- processMessageTimer->start( 0, true );
-+ return;
- } else {
- if (!folder) // no filter folder specified leave in current place
- folder = orgMsg->parent();
-@@ -659,7 +662,7 @@
- mSrcFolder->addMsg( msg );
- mIgnore = false;
-
-- if (msg && kmkernel->folderIsTrash( folder ))
-+ if (msg && folder && kmkernel->folderIsTrash( folder ))
- KMFilterAction::sendMDN( msg, KMime::MDN::Deleted );
-
- timeOutTime = QTime::currentTime();
-@@ -722,8 +725,6 @@
-
- void ActionScheduler::copyMessageFinished( KMCommand *command )
- {
-- // FIXME remove the debug output
-- kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl;
- if ( command->result() != KMCommand::OK )
- actionMessage( KMFilterAction::ErrorButGoOn );
- else
-@@ -803,4 +804,11 @@
- return sEnabled;
- }
-
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+ bool oldValue = mIgnore;
-+ mIgnore = ignore;
-+ return oldValue;
-+}
-+
- #include "actionscheduler.moc"
-Index: kmversion.h
-===================================================================
---- kmail/kmversion.h (Revision 487211)
-+++ kmail/kmversion.h (Arbeitskopie)
-@@ -3,6 +3,6 @@
- #ifndef kmversion_h
- #define kmversion_h
-
--#define KMAIL_VERSION "1.9"
-+#define KMAIL_VERSION "1.9.1"
-
- #endif /*kmversion_h*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 18:18:35 +0000