diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /kde-apps/kmail | |
parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) |
gentoo resync : 08.06.2019
Diffstat (limited to 'kde-apps/kmail')
-rw-r--r-- | kde-apps/kmail/Manifest | 5 | ||||
-rw-r--r-- | kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch | 74 | ||||
-rw-r--r-- | kde-apps/kmail/kmail-19.04.2-r1.ebuild (renamed from kde-apps/kmail/kmail-19.04.1.ebuild) | 2 |
3 files changed, 79 insertions, 2 deletions
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest index 7dec0ad92226..568a0a251989 100644 --- a/kde-apps/kmail/Manifest +++ b/kde-apps/kmail/Manifest @@ -1,5 +1,6 @@ +AUX kmail-19.04.2-crash-on-exit.patch 2253 BLAKE2B a5d650ca1a9830c4c03e11f5a96c1ee784657aaa03a365529db33d458c47e4e065c2bee5c354a22bab465bb9f3a3f7f63ed4a60b2c4e75a5c41694b12b4488e1 SHA512 fa29b08e2cca64b67db7f8982f12b6703e686f607720bcbb86e57be1cd09caac3f6698f28bc1af7a999704738802cc5e498e03639a061d89ed8ce29a005e2746 DIST kmail-18.12.3.tar.xz 4724432 BLAKE2B 60b9eb05fd8847afd75e6bc780c6b2a44193216ae0a02fb46ec5dc8c7228c83cb043b2a4bd61126f228a6a0c1a1a005cb3a95856a3af62ccc012f00776146310 SHA512 579f44be2d6aef1759cdcc0fd1c596872ede5007122d9d537fd11c2f876c8f623bb398e17f407f203476ffce22fc665e878ab40518074abe4a6a96bd15c1a93a -DIST kmail-19.04.1.tar.xz 4724416 BLAKE2B b8053576e395f27aa470ce7ff96bde6f7866450106940f8fb3c2f9ef5edde22406870152d9c6b1399e5e8afc2dd28a7048351179c176144035256cc5b8a8f195 SHA512 5f823630fdc45ef114c2d4358254d9440ab42d032f139b88b3d479da58812882abf0cf83481f05e6e55578156cd6d57794883ec8b29b3c8a9693c71c5f42f723 +DIST kmail-19.04.2.tar.xz 4724392 BLAKE2B 3993b5eaa13a40ca5ffbbcdfd03cd445c17f1daa6c43bef6bdf5a29dbf9bb91258ae5086f76f18a54e45c59a2fdde4e0bbf7d68f500e0a73a74566e91715d3b7 SHA512 571fd9980341ae25318bdb6a3fd90f5ef5480ea0f9f75c136d69e7c3b111441b3804761576ca90f9ee1c6f39e7d14a9f7bff2c6ed840455697fe52a841ea1ad3 EBUILD kmail-18.12.3-r1.ebuild 3341 BLAKE2B 0da2f0d5bf0df80deebd7327fbca2a3c7cb2f308e0219246538beecd8ed8e56a90cc00f484d192fa245298486f8a3ef45778f66c309538897b4704acaac8fb9f SHA512 e3f6b79009d9ce02df7e574ea0fe8b764aa1e9d1175c135f0502ad9573c0a41e1d6a4491938730b488b3eb00b6b2d921d4ff74cd801de1dfc67d47f0c51f6f5d -EBUILD kmail-19.04.1.ebuild 3284 BLAKE2B edc7acad6373741943966ae3e5c21ffb55c3338e4b5aa2ce563605670b1232383865f85cc48420ef378158a7dd7f2b443a6cc8a58c32d110e90a1536ca5ab8e9 SHA512 aab977cd486f7e59a824441de006dc90450955c97e1c6cbdb960c94bed9282517d938220ad3abad72b9375aa49b43d9fc1fd7b1363038b9a4b8d09978c001e33 +EBUILD kmail-19.04.2-r1.ebuild 3336 BLAKE2B 204f4bb1df78df08b9593699dc20ce89fc2ead4f7c355c5d09dc6f1c392a9213904d506938ac1b9b2d9327eb8a426049de01e6f0e15c1cd2e3c950918f512725 SHA512 4cc9d06be96f7ea1dc59f0aa3dc6c58d9c81c3084bc791982942ee5edff18e9bd8cb8f8fda4d37910457cf69e3bc113ab6c7fadad2dc986a6d8da8226818eafe MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch new file mode 100644 index 000000000000..5817694013a7 --- /dev/null +++ b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch @@ -0,0 +1,74 @@ +From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Thu, 6 Jun 2019 18:10:42 +0200 +Subject: Fix kontact crash on logout. + +Summary: +KMail was creating new Akonadi jobs during mainwindow destruction, +due to not testing the bool in GuiActivateEvent. + +Same bt in bug 404881, apparently quitting from the akregator tray icon +[which quits all of kontact... separate issue...] gave the same crash. + +BUG: 404881 +FIXED-IN: 19.04.2 + +Test Plan: Run kontact, logout. Hello Drkonqi. + +Reviewers: mlaurent, winterz + +Reviewed By: mlaurent, winterz + +Subscribers: kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D21626 +--- + src/kmail_part.cpp | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp +index 703a1ee..96c4c07 100644 +--- a/src/kmail_part.cpp ++++ b/src/kmail_part.cpp +@@ -33,6 +33,7 @@ + + #include <QVBoxLayout> + ++#include <KParts/GUIActivateEvent> + #include <kparts/statusbarextension.h> + #include <kparts/mainwindow.h> + #include <kpluginfactory.h> +@@ -129,18 +130,18 @@ bool KMailPart::openFile() + void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e) + { + KParts::ReadOnlyPart::guiActivateEvent(e); +- mainWidget->initializeFilterActions(); +- mainWidget->tagActionManager()->createActions(); +- mainWidget->folderShortcutActionManager()->createActions(); +- mainWidget->populateMessageListStatusFilterCombo(); +- mainWidget->initializePluginActions(); +- /* +- FIXME it doesn't work when we switch component. +- const QString title = mainWidget->fullCollectionPath(); +- if (!title.isEmpty()) { +- Q_EMIT setWindowCaption(title); ++ if (e->activated()) { ++ mainWidget->initializeFilterActions(); ++ mainWidget->tagActionManager()->createActions(); ++ mainWidget->folderShortcutActionManager()->createActions(); ++ mainWidget->populateMessageListStatusFilterCombo(); ++ mainWidget->initializePluginActions(); ++ ++ const QString title = mainWidget->fullCollectionPath(); ++ if (!title.isEmpty()) { ++ Q_EMIT setWindowCaption(title); ++ } + } +- */ + } + + void KMailPart::exit() +-- +cgit v1.1 diff --git a/kde-apps/kmail/kmail-19.04.1.ebuild b/kde-apps/kmail/kmail-19.04.2-r1.ebuild index b7cf3b96c179..dd0a95a3f0d1 100644 --- a/kde-apps/kmail/kmail-19.04.1.ebuild +++ b/kde-apps/kmail/kmail-19.04.2-r1.ebuild @@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND} $(add_kdeapps_dep kmail-account-wizard) " +PATCHES=( "${FILESDIR}/${P}-crash-on-exit.patch" ) + RESTRICT+=" test" # bug 616878 src_prepare() { |