forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
- Loading branch information
Showing
2 changed files
with
149 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001 | ||
From: Laurent Montel <[email protected]> | ||
Date: Mon, 15 Jan 2018 13:50:15 +0100 | ||
Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore | ||
|
||
FIXED-IN: 5.7.2 | ||
BUG: 388953 | ||
--- | ||
src/kmmainwidget.cpp | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp | ||
index d0edc48..ab0996e 100644 | ||
--- a/src/kmmainwidget.cpp | ||
+++ b/src/kmmainwidget.cpp | ||
@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions() | ||
{ | ||
mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); | ||
actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction); | ||
- connect(mServerSideSubscription, &QAction::triggered, | ||
+ connect(mApplyAllFiltersFolderAction, &QAction::triggered, | ||
this, [this] { slotApplyFiltersOnFolder(/* recursive */ false); | ||
}); | ||
} | ||
@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions() | ||
{ | ||
mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); | ||
actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction); | ||
- connect(mServerSideSubscription, &QAction::triggered, | ||
+ connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered, | ||
this, [this] { slotApplyFiltersOnFolder(/* recursive */ true); | ||
}); | ||
} | ||
-- | ||
cgit v0.11.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
# Copyright 1999-2018 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=6 | ||
|
||
KDE_HANDBOOK="forceoptional" | ||
KDE_TEST="forceoptional" | ||
VIRTUALX_REQUIRED="test" | ||
inherit kde5 | ||
|
||
DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." | ||
HOMEPAGE="https://www.kde.org/applications/internet/kmail/" | ||
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" | ||
KEYWORDS="~amd64 ~x86" | ||
IUSE="" | ||
|
||
COMMON_DEPEND=" | ||
$(add_frameworks_dep kbookmarks) | ||
$(add_frameworks_dep kcmutils) | ||
$(add_frameworks_dep kcodecs) | ||
$(add_frameworks_dep kcompletion) | ||
$(add_frameworks_dep kconfig) | ||
$(add_frameworks_dep kconfigwidgets) | ||
$(add_frameworks_dep kcoreaddons) | ||
$(add_frameworks_dep kcrash) | ||
$(add_frameworks_dep kdbusaddons) | ||
$(add_frameworks_dep kguiaddons) | ||
$(add_frameworks_dep ki18n) | ||
$(add_frameworks_dep kiconthemes) | ||
$(add_frameworks_dep kitemviews) | ||
$(add_frameworks_dep kio) | ||
$(add_frameworks_dep kjobwidgets) | ||
$(add_frameworks_dep knotifications) | ||
$(add_frameworks_dep knotifyconfig) | ||
$(add_frameworks_dep kparts) | ||
$(add_frameworks_dep kservice) | ||
$(add_frameworks_dep ktextwidgets) | ||
$(add_frameworks_dep kwidgetsaddons) | ||
$(add_frameworks_dep kwindowsystem) | ||
$(add_frameworks_dep kxmlgui) | ||
$(add_frameworks_dep sonnet) | ||
$(add_kdeapps_dep akonadi) | ||
$(add_kdeapps_dep akonadi-contacts) | ||
$(add_kdeapps_dep akonadi-mime) | ||
$(add_kdeapps_dep akonadi-search) | ||
$(add_kdeapps_dep kcalcore) | ||
$(add_kdeapps_dep kcontacts) | ||
$(add_kdeapps_dep kdepim-apps-libs) | ||
$(add_kdeapps_dep kidentitymanagement) | ||
$(add_kdeapps_dep kmailtransport) | ||
$(add_kdeapps_dep kmime) | ||
$(add_kdeapps_dep kontactinterface) | ||
$(add_kdeapps_dep kpimtextedit) | ||
$(add_kdeapps_dep libgravatar) | ||
$(add_kdeapps_dep libkdepim) | ||
$(add_kdeapps_dep libkleo) | ||
$(add_kdeapps_dep libksieve) | ||
$(add_kdeapps_dep libktnef) | ||
$(add_kdeapps_dep mailcommon) | ||
$(add_kdeapps_dep messagelib) | ||
$(add_kdeapps_dep pimcommon) | ||
$(add_qt_dep qtdbus) | ||
$(add_qt_dep qtgui) | ||
$(add_qt_dep qtnetwork) | ||
$(add_qt_dep qtwebengine 'widgets') | ||
$(add_qt_dep qtwidgets) | ||
$(add_qt_dep qtxml) | ||
>=app-crypt/gpgme-1.7.1[cxx,qt5] | ||
" | ||
DEPEND="${COMMON_DEPEND} | ||
$(add_kdeapps_dep kcalutils) | ||
$(add_kdeapps_dep kldap) | ||
dev-libs/libxslt | ||
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) | ||
" | ||
RDEPEND="${COMMON_DEPEND} | ||
!kde-apps/kdepim-common-libs:4 | ||
!kde-apps/kdepim-l10n | ||
!kde-apps/ktnef | ||
$(add_kdeapps_dep kdepim-runtime) | ||
$(add_kdeapps_dep kmail-account-wizard) | ||
" | ||
|
||
RESTRICT+=" test" # bug 616878 | ||
|
||
PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" ) | ||
|
||
src_prepare() { | ||
cmake-utils_src_prepare | ||
|
||
if ! use handbook; then | ||
sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die | ||
fi | ||
} | ||
|
||
pkg_postinst() { | ||
kde5_pkg_postinst | ||
|
||
pkg_is_installed() { | ||
echo "${1} ($(has_version ${1} || echo "not ")installed)" | ||
} | ||
|
||
elog "KMail supports the following runtime dependencies:" | ||
elog " Virus detection:" | ||
elog " $(pkg_is_installed app-antivirus/clamav)" | ||
elog " Spam filtering:" | ||
elog " $(pkg_is_installed mail-filter/bogofilter)" | ||
elog " $(pkg_is_installed mail-filter/spamassassin)" | ||
elog " Fancy e-mail headers and various useful plugins:" | ||
elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})" | ||
elog " Crypto config and certificate details GUI:" | ||
elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})" | ||
} |