summaryrefslogtreecommitdiffstats
path: root/kde/patch/kdepim
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch/kdepim')
-rw-r--r--kde/patch/kdepim/kdepim-4.5.85-install-headers.patch124
-rw-r--r--kde/patch/kdepim/kdepim-4.7.1_memleak.patch22
-rw-r--r--kde/patch/kdepim/kdepim-4.8.1_bug_258551.patch58
-rw-r--r--kde/patch/kdepim/kdepim-4.8.80_x11libs.patch30
4 files changed, 0 insertions, 234 deletions
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)
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-27 23:56:47 +0000