* [gentoo-commits] gentoo-x86 commit in kde-base/kmail/files/4.4: 0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch 0005-Fix-bug-276086-crash-on-exit.patch 0004-libkdepim-Make-spell-checking-work-again.patch 0004-kmail-Make-spell-checking-work-again.patch
@ 2012-08-01 22:54 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2012-08-01 22:54 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/08/01 22:54:53
Added:
0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
0005-Fix-bug-276086-crash-on-exit.patch
0004-libkdepim-Make-spell-checking-work-again.patch
0004-kmail-Make-spell-checking-work-again.patch
Log:
Add upstream bugfixes
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&content-type=text/plain
Index: 0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
===================================================================
From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 25 Apr 2011 22:09:08 +0200
Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.
Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
the bug seen on fedora.
Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
best I can do because I can't reproduce the issue.
BUG: 268120
---
kaddressbook/main.cpp | 2 +-
kmail/kmmainwidget.cpp | 2 +-
kmail/main.cpp | 2 +-
kontact/src/main.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 10b14e4..f6461d9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -189,7 +189,7 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
mVacationIndicatorActive( false ),
mGoToFirstUnreadMessageInSelectedFolder( false )
{
-#if KDE_IS_VERSION(4,6,0)
+#if KDE_IS_VERSION(4,6,2)
Akonadi::Control::widgetNeedsAkonadi(this);
Akonadi::ServerManager::start();
#endif
diff --git a/kmail/main.cpp b/kmail/main.cpp
index c2dd1c3..f59d5e6 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
app.setEventLoopReached();
app.delayedInstanceCreation();
-#if !KDE_IS_VERSION(4,6,0)
+#if !KDE_IS_VERSION(4,6,2)
// Start Akonadi
if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
//TODO: add message box after string freeze
--
1.7.9.2
1.1 kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch?rev=1.1&content-type=text/plain
Index: 0005-Fix-bug-276086-crash-on-exit.patch
===================================================================
From fb1874f8e2805f0afb3b9e848e8fd4d9ee11a97f Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Mon, 20 Jun 2011 13:27:05 +0200
Subject: [PATCH 5/6] Fix bug #276086 crash on exit
---
kmail/accountmanager.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index 1745aa4..ca2a7c8 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -227,7 +227,8 @@ void AccountManager::processNextCheck( bool _newMail )
curAccount->setCheckingMail( true );
mAcctChecking.append( curAccount );
- kmkernel->filterMgr()->ref();
+ if( kmkernel->filterMgr() )
+ kmkernel->filterMgr()->ref();
curAccount->processNewMail( mInteractive );
}
--
1.7.9.2
1.1 kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch?rev=1.1&content-type=text/plain
Index: 0004-libkdepim-Make-spell-checking-work-again.patch
===================================================================
From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Wed, 11 May 2011 18:21:32 +0100
Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
wrong config file for loading spell settings. After
using the config file, the correct settigns get loaded
again, since the Loader from Sonnet is a singleton and
therefore shares the settings, so even the textedit
with the wrong settings file name gets updated.
cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
BUG: 247486
---
kmail/kmcomposereditor.cpp | 2 +-
libkdepim/kmeditor.cpp | 12 ++++++++++++
libkdepim/kmeditor.h | 6 ++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/libkdepim/kmeditor.cpp b/libkdepim/kmeditor.cpp
index e8f0d36..067c781 100644
--- a/libkdepim/kmeditor.cpp
+++ b/libkdepim/kmeditor.cpp
@@ -28,6 +28,7 @@
#include <KProcess>
#include <KPushButton>
#include <KTemporaryFile>
+#include <kdeversion.h>
#include <QApplication>
#include <QClipboard>
@@ -215,6 +216,17 @@ KMeditor::KMeditor( QWidget *parent )
d->init();
}
+KMeditor::KMeditor( QWidget *parent, const QString & configFile )
+#if KDE_IS_VERSION(4,6,0)
+ : TextEdit( parent, configFile ), d( new KMeditorPrivate( this ) )
+#else
+ : TextEdit( parent ), d( new KMeditorPrivate( this ) )
+#endif
+{
+ Q_UNUSED( configFile )
+ d->init();
+}
+
KMeditor::~KMeditor()
{
delete d;
diff --git a/libkdepim/kmeditor.h b/libkdepim/kmeditor.h
index 4aab8aa..66ebb4a 100644
--- a/libkdepim/kmeditor.h
+++ b/libkdepim/kmeditor.h
@@ -61,6 +61,12 @@ class KDEPIM_EXPORT KMeditor : public KPIMTextEdit::TextEdit
*/
explicit KMeditor( QWidget *parent = 0 );
+ /**
+ * Constructs a KMeditor object.
+ */
+ explicit KMeditor( QWidget *parent, const QString& configFile );
+
+
virtual ~KMeditor();
//Redefine it for each apps
--
1.7.9.2
1.1 kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch?rev=1.1&content-type=text/plain
Index: 0004-kmail-Make-spell-checking-work-again.patch
===================================================================
From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
From: Thomas McGuire <mcguire@kde.org>
Date: Wed, 11 May 2011 18:21:32 +0100
Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
wrong config file for loading spell settings. After
using the config file, the correct settigns get loaded
again, since the Loader from Sonnet is a singleton and
therefore shares the settings, so even the textedit
with the wrong settings file name gets updated.
cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
BUG: 247486
---
kmail/kmcomposereditor.cpp | 2 +-
libkdepim/kmeditor.cpp | 12 ++++++++++++
libkdepim/kmeditor.h | 6 ++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/kmail/kmcomposereditor.cpp b/kmail/kmcomposereditor.cpp
index f1accab..74de65b 100644
--- a/kmail/kmcomposereditor.cpp
+++ b/kmail/kmcomposereditor.cpp
@@ -44,7 +44,7 @@
#include <QFileInfo>
KMComposerEditor::KMComposerEditor( KMComposeWin *win,QWidget *parent)
- :KMeditor(parent),m_composerWin(win)
+ :KMeditor(parent, "kmailrc"),m_composerWin(win)
{
}
--
1.7.9.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-01 22:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-01 22:54 [gentoo-commits] gentoo-x86 commit in kde-base/kmail/files/4.4: 0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch 0005-Fix-bug-276086-crash-on-exit.patch 0004-libkdepim-Make-spell-checking-work-again.patch 0004-kmail-Make-spell-checking-work-again.patch Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox