summaryrefslogtreecommitdiff
path: root/kde-apps/kmail/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-05 05:24:13 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-05 05:24:13 +0100
commit6de28447d66e6c47ee682740b840cdb67244d4b1 (patch)
tree382b94d5f61bc727e86d8d8df99540eb1da88953 /kde-apps/kmail/files
parent3b4ca161c9d7f5a66a93191da2c9ec02dbdde1b7 (diff)
gentoo auto-resync : 05:04:2023 - 05:24:13
Diffstat (limited to 'kde-apps/kmail/files')
-rw-r--r--kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch38
-rw-r--r--kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch47
-rw-r--r--kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch52
-rw-r--r--kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch29
-rw-r--r--kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch41
5 files changed, 0 insertions, 207 deletions
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
deleted file mode 100644
index 5692a4916129..000000000000
--- a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 94e28559c96b71721b02393a23cbfeefa93a607b Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Sat, 7 Jan 2023 00:31:18 +0100
-Subject: [PATCH] Fix bug 463935: Crash on attempting to replay a message with
- an user template
-
-BUG: 463935
-FIXED-IN: 5.22.2
----
- src/kmmainwidget.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
-index b00db6f53..3ab6a18af 100644
---- a/src/kmmainwidget.cpp
-+++ b/src/kmmainwidget.cpp
-@@ -2096,8 +2096,7 @@ void KMMainWidget::slotCustomReplyAllToMsg(const QString &tmpl)
- qCDebug(KMAIL_LOG) << "Reply to All with template:" << tmpl;
-
- auto command = new KMReplyCommand(this, msg, MessageComposer::ReplyAll, text, false, tmpl);
-- command->setReplyAsHtml(messageView()->htmlMail());
--
-+ command->setReplyAsHtml(messageView() ? messageView()->htmlMail() : false);
- command->start();
- }
-
-@@ -4745,7 +4744,7 @@ void KMMainWidget::slotRedirectCurrentMessage()
- void KMMainWidget::replyMessageTo(const Akonadi::Item &item, bool replyToAll)
- {
- auto command = new KMReplyCommand(this, item, replyToAll ? MessageComposer::ReplyAll : MessageComposer::ReplyAuthor);
-- command->setReplyAsHtml(messageView()->htmlMail());
-+ command->setReplyAsHtml(messageView() ? messageView()->htmlMail() : false);
- command->start();
- }
-
---
-GitLab
-
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
deleted file mode 100644
index a798f1afe567..000000000000
--- a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9d37b837eca35bd7976709a9d25d3700c70e321e Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Sat, 31 Dec 2022 10:55:34 +0100
-Subject: [PATCH] Fix bug 460747: Kontact Crashes Upon Start
-
-BUG: 460747
-FIXED-IN: 5.22.1
----
- src/kmmainwidget.cpp | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
-index 8d332b36b..8c7013f8b 100644
---- a/src/kmmainwidget.cpp
-+++ b/src/kmmainwidget.cpp
-@@ -3403,6 +3403,14 @@ void KMMainWidget::setupActions()
- QAction *act = actionCollection()->addAction(KStandardAction::Undo, QStringLiteral("kmail_undo"));
- connect(act, &QAction::triggered, this, &KMMainWidget::slotUndo);
-
-+ mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
-+ actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
-+ connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
-+
-+ mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
-+ actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
-+ connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
-+
- menutimer = new QTimer(this);
- menutimer->setObjectName(QStringLiteral("menutimer"));
- menutimer->setSingleShot(true);
-@@ -3535,13 +3543,6 @@ void KMMainWidget::setupActions()
- actionCollection()->addAction(QStringLiteral("remove_duplicate_recursive"), mRemoveDuplicateRecursiveAction);
- connect(mRemoveDuplicateRecursiveAction, &KToggleAction::triggered, this, &KMMainWidget::slotRemoveDuplicateRecursive);
-
-- mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
-- actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
-- connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
--
-- mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
-- actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
-- connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
- {
- QList<QAction *> listActions;
- auto act = new QAction(i18n("Previous Selected Folder"), this); // TODO fix me i18n
---
-GitLab
-
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
deleted file mode 100644
index 1ff35b388dc7..000000000000
--- a/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 437295a534eca2907e749f18d8d895da50d343b9 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Sat, 10 Dec 2022 19:55:33 +0100
-Subject: [PATCH] Fix bug 460289: Opening the detailed progress window does
- nothing
-
-BUG: 460289
-FIXED-IN: 5.22.1
----
- src/kmmainwin.cpp | 5 ++++-
- src/kmmainwin.h | 2 +-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
-index 5900bf309..9952667fe 100644
---- a/src/kmmainwin.cpp
-+++ b/src/kmmainwin.cpp
-@@ -36,7 +36,6 @@ using namespace std::chrono_literals;
-
- KMMainWin::KMMainWin(QWidget *)
- : KXmlGuiWindow(nullptr)
-- , mProgressBar(new KPIM::ProgressStatusBarWidget(statusBar(), this))
- , mMessageLabel(new QLabel(i18n("Starting...")))
-
- {
-@@ -51,6 +50,10 @@ KMMainWin::KMMainWin(QWidget *)
- resize(700, 500); // The default size
-
- mKMMainWidget = new KMMainWidget(this, this, actionCollection());
-+
-+ // Don't initialize in constructor. We need this statusbar created
-+ // Bug 460289
-+ mProgressBar = new KPIM::ProgressStatusBarWidget(statusBar(), this);
- connect(mKMMainWidget, &KMMainWidget::recreateGui, this, &KMMainWin::slotUpdateGui);
- setCentralWidget(mKMMainWidget);
- setupStatusBar();
-diff --git a/src/kmmainwin.h b/src/kmmainwin.h
-index 314f14d47..377f6818b 100644
---- a/src/kmmainwin.h
-+++ b/src/kmmainwin.h
-@@ -57,7 +57,7 @@ private:
- void updateHamburgerMenu();
- void slotShortcutSaved();
- void slotFullScreen(bool t);
-- KPIM::ProgressStatusBarWidget *const mProgressBar;
-+ KPIM::ProgressStatusBarWidget *mProgressBar = nullptr;
- KMMainWidget *mKMMainWidget = nullptr;
- KToggleAction *mShowMenuBarAction = nullptr;
- QLabel *const mMessageLabel;
---
-GitLab
-
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
deleted file mode 100644
index 282fb6109acc..000000000000
--- a/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6618f8f80ccadff908d11db7506b3af8d15ad032 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 16 Dec 2022 06:59:17 +0100
-Subject: [PATCH] BUG: 459399 Fix Random text in kmail's message list
- configuration settings
-
-Apply patch from Yaroslav Sidlovsky (thanks)
-BUG: 459399
-FIXED-IN: 5.22.1
----
- src/configuredialog/configureappearancepage.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
-index 085179f05..0909db227 100644
---- a/src/configuredialog/configureappearancepage.cpp
-+++ b/src/configuredialog/configureappearancepage.cpp
-@@ -622,7 +622,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab(QWidget *parent)
- .subs(DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay))
- .toString(); // i18n(label, DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay));
- } else {
-- buttonLabel = i18n(label);
-+ buttonLabel = KLocalizedString(dateDisplayConfig[i].displayName).toString();
- }
- if (dateDisplayConfig[i].dateDisplay == DateFormatter::Custom) {
- auto hbox = new QWidget(this);
---
-GitLab
-
diff --git a/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch b/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
deleted file mode 100644
index a6484b11ae50..000000000000
--- a/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fc0b487d3f3ac9c9ca0650aa635795b5478de85b Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 16 Dec 2022 07:28:28 +0100
-Subject: [PATCH] Remove info about removed feature (ShowUserAgent)
-
-CCBUG: 448348
----
- doc/kmail2/configure.docbook | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
-index 4916acd8b..bb2648370 100644
---- a/doc/kmail2/configure.docbook
-+++ b/doc/kmail2/configure.docbook
-@@ -4167,23 +4167,6 @@ behavior, add to the [OutOfOffice] section:</para>
- </itemizedlist>
- </listitem>
- </varlistentry>
--<varlistentry>
--<term><guilabel>ShowUserAgent</guilabel></term>
--<listitem>
--<para>
--Starting in version 1.9, &kmail; can show the User-Agent or X-Mailer value
--from the message header when using Fancy Headers (see <menuchoice><guimenu>View</guimenu>
--<guisubmenu>Headers</guisubmenu></menuchoice> menu).
--To enable this feature, add to the <quote>[Reader]</quote> section:</para>
--<itemizedlist>
--<listitem><para>Configuration file:</para>
--<programlisting>ShowUserAgent=true</programlisting></listitem>
--<listitem><para><command>kwriteconfig</command></para>
--<para><prompt>&percnt;</prompt> <userinput><command>kwriteconfig</command> <option>--file <replaceable>/path/to/kmail2rc</replaceable> --group Reader --key ShowUserAgent true</option></userinput>
--</para></listitem>
--</itemizedlist>
--</listitem>
--</varlistentry>
- </variablelist>
- </sect1>
-
---
-GitLab
-