From owner-svn-ports-head@freebsd.org Fri Jun 7 04:35:40 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32C7A15C827F; Fri, 7 Jun 2019 04:35:40 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BAE2393A8C; Fri, 7 Jun 2019 04:35:39 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1A1826CDF; Fri, 7 Jun 2019 04:35:39 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x574Zddq064678; Fri, 7 Jun 2019 04:35:39 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x574ZdAF064677; Fri, 7 Jun 2019 04:35:39 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201906070435.x574ZdAF064677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 7 Jun 2019 04:35:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503612 - in head/deskutils/kmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/deskutils/kmail: . files X-SVN-Commit-Revision: 503612 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BAE2393A8C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.95)[-0.950,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jun 2019 04:35:40 -0000 Author: tcberner Date: Fri Jun 7 04:35:38 2019 New Revision: 503612 URL: https://svnweb.freebsd.org/changeset/ports/503612 Log: deskutils/kmail: add upstream fix for crash on exit https://cgit.kde.org/kmail.git/patch/?id=97e165dcf5a851ee10526631d24f9af7736da2e6 Added: head/deskutils/kmail/files/ head/deskutils/kmail/files/patch-git_97e165 (contents, props changed) Modified: head/deskutils/kmail/Makefile Modified: head/deskutils/kmail/Makefile ============================================================================== --- head/deskutils/kmail/Makefile Fri Jun 7 04:08:25 2019 (r503611) +++ head/deskutils/kmail/Makefile Fri Jun 7 04:35:38 2019 (r503612) @@ -2,6 +2,7 @@ PORTNAME= kmail DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde kde-applications MAINTAINER= kde@FreeBSD.org Added: head/deskutils/kmail/files/patch-git_97e165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/kmail/files/patch-git_97e165 Fri Jun 7 04:35:38 2019 (r503612) @@ -0,0 +1,75 @@ +From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001 +From: David Faure +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 +--- src/kmail_part.cpp ++++ src/kmail_part.cpp +@@ -33,6 +33,7 @@ + + #include + ++#include + #include + #include + #include +@@ -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 +