diff options
Diffstat (limited to '')
8 files changed, 0 insertions, 367 deletions
diff --git a/kde/patch/kdepim-runtime.patch b/kde/patch/kdepim-runtime.patch deleted file mode 100644 index 0fa7a5a..0000000 --- a/kde/patch/kdepim-runtime.patch +++ /dev/null @@ -1,7 +0,0 @@ -# Fix a bug in kdepim-runtime 4.7.1 which can cause an email to be permanently -# lost when downloading from a POP3 account into a maildir-style mailbox: -#cat $CWD/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Address bug 283467, fixed in KDE 4.7.3: -#cat $CWD/patch/kdepim-runtime/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch b/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch deleted file mode 100644 index 2a8397d..0000000 --- a/kde/patch/kdepim-runtime/0001-Ignore-items-with-empty-remote-ids-here.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ccd67f3e65c9ffe32858ca521aa1e56a42b026af Mon Sep 17 00:00:00 2001 -From: Volker Krause <vkrause@kde.org> -Date: Tue, 20 Sep 2011 10:12:40 +0200 -Subject: [PATCH] Ignore items with empty remote ids here. - -Items with empty remote id are those not yet stored by the resource, -ie. we still have pending change replays for those. So, if we do a sync -during that period (which could happen since the introduction of the -file system watcher), we would remove a random one of those (only one -since the map would only contain one without a remote id). This mostly -affects the POP3 usage pattern. -(cherry picked from commit f814b46a799ea8418ae17cf77d44da473124d12d) ---- - resources/maildir/retrieveitemsjob.cpp | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp -index 7253f7e..f0273ef 100644 ---- a/resources/maildir/retrieveitemsjob.cpp -+++ b/resources/maildir/retrieveitemsjob.cpp -@@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job ) - - const Akonadi::Item::List items = qobject_cast<Akonadi::ItemFetchJob*>( job )->items(); - m_localItems.reserve( items.size() ); -- foreach ( const Akonadi::Item &item, items ) -- m_localItems.insert( item.remoteId(), item ); -+ foreach ( const Akonadi::Item &item, items ) { -+ if ( !item.remoteId().isEmpty() ) -+ m_localItems.insert( item.remoteId(), item ); -+ } - - const QStringList entryList = m_maildir.entryList(); - qint64 previousMtime = m_collection.remoteRevision().toLongLong(); --- -1.7.1 - diff --git a/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch b/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch deleted file mode 100644 index 1c1dcc5..0000000 --- a/kde/patch/kdepim-runtime/Kmail-has-duplicated-folders-after-migration-from-previous-version_bug-283467.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Montel Laurent <montel@kde.org> -Date: Fri, 07 Oct 2011 15:14:06 +0000 -Subject: Fix Bug 283467 - Kmail has duplicated folders after migration from previous version. -X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&a=commitdiff&h=6bdc6290632be5fc6c103064463d7421b5e3b60d ---- -Fix Bug 283467 - Kmail has duplicated folders after migration from previous version. - -By default in config we don't translate config name. -We use "inbox" "sent-mail" etc. - -BUG: 283467 -FIXED-IN: 4.7.3 ---- - - ---- a/migration/kmail/localfolderscollectionmigrator.cpp -+++ b/migration/kmail/localfolderscollectionmigrator.cpp -@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::set - - const KConfigGroup group( config, QLatin1String( "General" ) ); - -- QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Inbox ); -- -- name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Outbox ); -- -- name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::SentMail ); -- -- name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Trash ); -- -- name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Drafts ); -- -- name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Templates ); -+ if ( group.hasKey( QLatin1String( "inboxFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::Inbox ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "inbox" ), SpecialMailCollections::Inbox ); -+ -+ if ( group.hasKey( QLatin1String( "outboxFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::Outbox ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "outbox" ), SpecialMailCollections::Outbox ); -+ -+ if ( group.hasKey( QLatin1String( "sentFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::SentMail ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "sent-mail" ), SpecialMailCollections::SentMail ); -+ -+ if ( group.hasKey( QLatin1String( "trashFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::Trash ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "trash" ), SpecialMailCollections::Trash ); -+ -+ if ( group.hasKey( QLatin1String( "draftsFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::Drafts ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "drafts" ), SpecialMailCollections::Drafts ); -+ -+ if ( group.hasKey( QLatin1String( "templatesFolder" ) ) ) { -+ const QString name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) ); -+ d->mSystemFolders.insert( name, SpecialMailCollections::Templates ); -+ } else -+ d->mSystemFolders.insert( QLatin1String( "templates" ), SpecialMailCollections::Templates ); - } - - void LocalFoldersCollectionMigrator::migrateCollection( const Collection &collection, const QString &folderId ) diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch deleted file mode 100644 index 516270d..0000000 --- a/kde/patch/kdepim.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Install the kleopatra headers, or else kopete-cryptography will not build: -cat $CWD/patch/kdepim/kdepim-4.5.85-install-headers.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Fix a memleak in kdepim 4.7.1 (fixed just too late to be included in the -# 4.7.1 tarball) -#cat $CWD/patch/kdepim/kdepim-4.7.1_memleak.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Fix a memleak in kdepim 4.8.1 -# (it got included in the tarball _just_ before the release) -#cat $CWD/patch/kdepim/kdepim-4.8.1_bug_258551.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Build fix for 4.8.80 but does nnot seem to be needed on Slackware: -#cat $CWD/patch/kdepim/kdepim-4.8.80_x11libs.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - diff --git a/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch b/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch deleted file mode 100644 index aa43059..0000000 --- a/kde/patch/kdepim/kdepim-4.5.85-install-headers.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt ---- kdepim-4.5.85/kleopatra/libkleopatraclient/CMakeLists.txt 2010-01-27 01:22:34.000000000 +0100 -+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/CMakeLists.txt 2010-12-08 14:40:45.000000000 +0100 -@@ -6,3 +6,7 @@ - - add_subdirectory( tests ) - -+install( -+ FILES kleopatraclient_export.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient -+ ) -diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt ---- kdepim-4.5.85/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-11-19 11:51:51.000000000 +0100 -+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/core/CMakeLists.txt 2010-12-08 14:42:12.000000000 +0100 -@@ -55,4 +55,12 @@ - DESTINATION ${LIB_INSTALL_DIR} - ) - -- -+install( -+ FILES -+ initialization.h -+ command.h -+ selectcertificatecommand.h -+ signencryptfilescommand.h -+ decryptverifyfilescommand.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core -+ ) -diff -ur kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt ---- kdepim-4.5.85/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-07-29 11:58:45.000000000 +0200 -+++ kdepim-4.5.85-install-headers/kleopatra/libkleopatraclient/gui/CMakeLists.txt 2010-12-08 14:42:41.000000000 +0100 -@@ -20,3 +20,8 @@ - DESTINATION ${LIB_INSTALL_DIR} - ) - -+install( -+ FILES -+ certificaterequester.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui -+ ) -diff -ur kdepim-4.5.85/libkleo/CMakeLists.txt kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt ---- kdepim-4.5.85/libkleo/CMakeLists.txt 2010-12-01 23:23:12.000000000 +0100 -+++ kdepim-4.5.85-install-headers/libkleo/CMakeLists.txt 2010-12-08 15:22:00.000000000 +0100 -@@ -112,6 +112,64 @@ - set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) - install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS}) - -+install( FILES -+ kleo/kleo_export.h -+ kleo/enum.h -+ kleo/oidmap.h -+ kleo/cryptobackend.h -+ kleo/cryptobackendfactory.h -+ kleo/cryptoconfig.h -+ kleo/dn.h -+ kleo/job.h -+ kleo/keylistjob.h -+ kleo/keygenerationjob.h -+ kleo/abstractimportjob.h -+ kleo/importjob.h -+ kleo/importfromkeyserverjob.h -+ kleo/exportjob.h -+ kleo/changeexpiryjob.h -+ kleo/changeownertrustjob.h -+ kleo/downloadjob.h -+ kleo/deletejob.h -+ kleo/encryptjob.h -+ kleo/decryptjob.h -+ kleo/signjob.h -+ kleo/specialjob.h -+ kleo/verifydetachedjob.h -+ kleo/verifyopaquejob.h -+ kleo/decryptverifyjob.h -+ kleo/signencryptjob.h -+ kleo/signkeyjob.h -+ kleo/adduseridjob.h -+ kleo/refreshkeysjob.h -+ kleo/multideletejob.h -+ kleo/hierarchicalkeylistjob.h -+ kleo/keyfilter.h -+ kleo/keyfiltermanager.h -+ kleo/changepasswdjob.h -+ kleo/checksumdefinition.h -+ kleo/exception.h -+ kleo/kconfigbasedkeyfilter.h -+ kleo/listallkeysjob.h -+ kleo/stl_util.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel) -+ -+install ( FILES -+ ui/kdhorizontalline.h -+ ui/messagebox.h -+ ui/progressbar.h -+ ui/progressdialog.h -+ ui/keylistview.h -+ ui/keyselectiondialog.h -+ ui/keyrequester.h -+ ui/keyapprovaldialog.h -+ ui/dnattributeorderconfigwidget.h -+ ui/cryptoconfigmodule.h -+ ui/cryptoconfigdialog.h -+ ui/directoryserviceswidget.h -+ ui/filenamerequester.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel) -+ - if ( WIN32 ) - install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) - else ( WIN32 ) -diff -ur kdepim-4.5.85/libkpgp/CMakeLists.txt kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt ---- kdepim-4.5.85/libkpgp/CMakeLists.txt 2010-07-29 11:59:00.000000000 +0200 -+++ kdepim-4.5.85-install-headers/libkpgp/CMakeLists.txt 2010-12-08 14:43:33.000000000 +0100 -@@ -35,3 +35,11 @@ - install(FILES kpgp.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - install(PROGRAMS kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - -+install(FILES -+ kpgp.h -+ kpgpbase.h -+ kpgpblock.h -+ kpgpkey.h -+ kpgpui.h -+ libkpgp_export.h -+ DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel ) - diff --git a/kde/patch/kdepim/kdepim-4.7.1_memleak.patch b/kde/patch/kdepim/kdepim-4.7.1_memleak.patch deleted file mode 100644 index e959dfa..0000000 --- a/kde/patch/kdepim/kdepim-4.7.1_memleak.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 0dbc5c1b233d355dce26868253c0e8f4dede58d4 -Author: Montel Laurent <montel@kde.org> -Date: Mon Sep 5 16:01:10 2011 +0200 - - Fix mem leak (too bad it will not in 4.7.1) - -diff --git a/mailcommon/foldercollection.cpp b/mailcommon/foldercollection.cpp -index 3c31d8e..2d4ca73 100644 ---- a/mailcommon/foldercollection.cpp -+++ b/mailcommon/foldercollection.cpp -@@ -294,8 +294,10 @@ uint FolderCollection::identity() const - OrgKdeAkonadiImapSettingsInterface *imapSettingsInterface = Util::createImapSettingsInterface( mCollection.resource() ); - if ( imapSettingsInterface->isValid() ) { - QDBusReply<bool> useDefault = imapSettingsInterface->useDefaultIdentity(); -- if( useDefault.isValid() && useDefault.value() ) -+ if( useDefault.isValid() && useDefault.value() ) { -+ delete imapSettingsInterface; - return mIdentity; -+ } - - QDBusReply<int> remoteAccountIdent = imapSettingsInterface->accountIdentity(); - if ( remoteAccountIdent.isValid() && remoteAccountIdent.value() > 0 ) { diff --git a/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch b/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch deleted file mode 100644 index c94cf11..0000000 --- a/kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 7e4953c54752dca8a10ad29adf2e225a96f8669a -Author: Montel Laurent <montel@kde.org> -Date: Mon Mar 5 21:59:44 2012 +0100 - - Fix Bug 258551 - KMailCVT leaks lots of memory when importing maildir - - Akonadi::ItemCreateJob was never delete during importing so memory used increase a lot. - (for example during importing 2 Go it takes 2.5Go virtual memory before, after my fix it takes just 400Mo) - Too bad that it's will not in 4.8.1 - FIXED-IN: 4.8.2 - BUG: 258551 - (cherry picked from commit eafff41025775a8a2c15cd3f26233bd8d50cb277) - - If we can't update kdepim source please add this patch to your source please. - - CCMAIL: kde-packager@kde.org - -diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx -index 8579534..7ffb005 100644 ---- a/kmailcvt/filters.cxx -+++ b/kmailcvt/filters.cxx -@@ -169,11 +169,13 @@ bool Filter::addAkonadiMessage( FilterInfo* info, const Akonadi::Collection &col - } - item.setPayload<KMime::Message::Ptr>( message ); - Akonadi::ItemCreateJob* job = new Akonadi::ItemCreateJob( item, collection ); -+ job->setAutoDelete( false ); - if( !job->exec() ) { - info->alert( i18n( "<b>Error:</b> Could not add message to folder %1. Reason: %2", - collection.name(), job->errorString() ) ); - return false; - } -+ delete job; - return true; - } - - -commit d5933dd8913e9a57ef0b6a7f732d6a10d08f82ae -Author: Montel Laurent <montel@kde.org> -Date: Tue Mar 6 08:42:31 2012 +0100 - - Fix mem leak - - CCMAIL: mueller@kde.org - CCMAIL: kde-packager@kde.org - (cherry picked from commit 8de439bc0c39a511cfb69d5e5b111b2a5de72ccb) - -diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx -index 7ffb005..c3878da 100644 ---- a/kmailcvt/filters.cxx -+++ b/kmailcvt/filters.cxx -@@ -173,6 +173,7 @@ bool Filter::addAkonadiMessage( FilterInfo* info, const Akonadi::Collection &col - if( !job->exec() ) { - info->alert( i18n( "<b>Error:</b> Could not add message to folder %1. Reason: %2", - collection.name(), job->errorString() ) ); -+ delete job; - return false; - } - delete job; diff --git a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch deleted file mode 100644 index f87d8f4..0000000 --- a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 26f9d62b9a9b4bfa736b342903d16dc0d8739d98 -Author: Allen Winter <winter@kde.org> -Date: Thu May 31 12:58:07 2012 -0400 - - Revert last: Remove X11 requirement - - CCMAIL: djarvie@kde.org - David, without explicit linking to X11 libs, I get an unresolved - symbol for XSetWMHints - -diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt -index 9efb9a1..97e69a8 100644 ---- a/kalarm/CMakeLists.txt -+++ b/kalarm/CMakeLists.txt -@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI) - kdepim - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PHONON_LIBS} -+ ${X11_X11_LIB} - ) - else(KALARM_USE_AKONADI) - target_link_libraries(kalarm_bin -@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI) - kdepim - ${KDE4_KCMUTILS_LIBS} - ${KDE4_PHONON_LIBS} -+ ${X11_X11_LIB} - ) - endif(KALARM_USE_AKONADI) - |