[gentoo-commits] proj/kde:master commit in: kde-base/kmail/files/4.4/, kde-base/kmail/, kde-base/kmail/files/

[Andreas Hüttel]

commit:     e80b8c51c4b9564a84aac5c0ef9acae6d2be9964
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  2 18:21:14 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 18:21:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e80b8c51

[kde-base/kmail] Start a crazy experiment

Package-Manager: portage-2.2.0_alpha149

---
 ...start-akonadi-asynchronously-on-KDE-4.6.2.patch |   48 ++++++++++
 ...0004-kmail-Make-spell-checking-work-again.patch |   35 ++++++++
 ...-libkdepim-Make-spell-checking-work-again.patch |   69 +++++++++++++++
 .../4.4/0005-Fix-bug-276086-crash-on-exit.patch    |   26 ++++++
 kde-base/kmail/files/kmail-4.4.9-nodbus.patch      |   83 ++++++++++++++++++
 kde-base/kmail/kmail-4.4.11.1-r100.ebuild          |   91 ++++++++++++++++++++
 6 files changed, 352 insertions(+), 0 deletions(-)

diff --git a/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 0000000..11bcad6
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,48 @@
+From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@×××××.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
+

diff --git a/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
new file mode 100644
index 0000000..0004bec
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
@@ -0,0 +1,35 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@×××.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
+

diff --git a/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
new file mode 100644
index 0000000..19d8c01
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
@@ -0,0 +1,69 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@×××.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
+

diff --git a/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
new file mode 100644
index 0000000..5193c36
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
@@ -0,0 +1,26 @@
+From fb1874f8e2805f0afb3b9e848e8fd4d9ee11a97f Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.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
+

diff --git a/kde-base/kmail/files/kmail-4.4.9-nodbus.patch b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
new file mode 100644
index 0000000..af3237d
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.4.9-nodbus.patch
@@ -0,0 +1,83 @@
+diff -ruN kmail-4.4.9.orig/kmail/tests/CMakeLists.txt kmail-4.4.9/kmail/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/kmail/tests/CMakeLists.txt	2010-12-22 18:52:24.000000000 +0100
++++ kmail-4.4.9/kmail/tests/CMakeLists.txt	2011-01-25 23:52:38.953021223 +0100
+@@ -9,14 +9,14 @@
+ add_definitions(-DKMAIL_UNITTESTS=YES)
+ 
+ ########### htmlquotecolorertest ###############
+-set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
+-kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(htmlquotecolorertest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-)
++# set(htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
++# kde4_add_unit_test(htmlquotecolorertest TESTNAME kmail-quotecolorertest ${htmlquotecolorertest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(htmlquotecolorertest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++# )
+ 
+ ########### utiltests ###############
+ 
+diff -ruN kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt kmail-4.4.9/messagecore/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/messagecore/tests/CMakeLists.txt	2010-12-22 18:52:15.000000000 +0100
++++ kmail-4.4.9/messagecore/tests/CMakeLists.txt	2011-01-25 23:50:54.421021223 +0100
+@@ -13,6 +13,6 @@
+ # Attachment tests.
+ add_messagecore_test( attachmentcompressjobtest.cpp )
+ add_messagecore_test( attachmentfrommimecontentjobtest.cpp )
+-add_messagecore_test( attachmentfromurljobtest.cpp )
++# add_messagecore_test( attachmentfromurljobtest.cpp )
+ add_messagecore_test( attachmentparttest.cpp )
+-add_messagecore_test( attachmentpropertiesdialogtest.cpp )
++# add_messagecore_test( attachmentpropertiesdialogtest.cpp )
+diff -ruN kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt kmail-4.4.9/messageviewer/tests/CMakeLists.txt
+--- kmail-4.4.9.orig/messageviewer/tests/CMakeLists.txt	2010-12-22 18:52:47.000000000 +0100
++++ kmail-4.4.9/messageviewer/tests/CMakeLists.txt	2011-01-25 23:51:58.374021223 +0100
+@@ -6,23 +6,23 @@
+ )
+ 
+ ########### htmlquotecolorertest ###############
+-set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
+-kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(messageviewer_htmlquotecolorertest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-  messageviewer
+-)
++# set(messageviewer_htmlquotecolorertest_SRCS htmlquotecolorertest.cpp ../htmlquotecolorer.cpp)
++# kde4_add_unit_test(messageviewer_htmlquotecolorertest TESTNAME messageviewer-quotecolorertest ${messageviewer_htmlquotecolorertest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(messageviewer_htmlquotecolorertest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++#   messageviewer
++# )
+ 
+ ########### stringutiltest ###############
+-set(stringutiltest_SRCS stringutiltest.cpp)
+-kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-target_link_libraries(stringutiltest
+-  ${QT_QTTEST_LIBRARY}
+-  ${QT_QTCORE_LIBRARY}
+-  ${KDE4_KHTML_LIBRARY}
+-  messageviewer
+-)
++# set(stringutiltest_SRCS stringutiltest.cpp)
++# kde4_add_unit_test(stringutiltest TESTNAME messageviewer-stringutiltest ${stringutiltest_SRCS})
++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++# target_link_libraries(stringutiltest
++#   ${QT_QTTEST_LIBRARY}
++#   ${QT_QTCORE_LIBRARY}
++#   ${KDE4_KHTML_LIBRARY}
++#   messageviewer
++# )

diff --git a/kde-base/kmail/kmail-4.4.11.1-r100.ebuild b/kde-base/kmail/kmail-4.4.11.1-r100.ebuild
new file mode 100644
index 0000000..5352824
--- /dev/null
+++ b/kde-base/kmail/kmail-4.4.11.1-r100.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.11.1-r1.ebuild,v 1.5 2012/12/08 12:04:14 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_MINIMAL="4.10"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+add_blocker kmailcvt
+add_blocker libksieve
+add_blocker messagecore
+add_blocker messagelist
+add_blocker messageviewer
+add_blocker mimelib
+
+KMEXTRACTONLY="
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo/
+	libkpgp/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mimelib/
+	plugins/kmail/
+"
+#KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+	"${FILESDIR}/4.4/"000{2,4,5}-*.patch
+)
+
+pkg_pretend() {
+	[ "${I_KNOW_WHAT_I_AM_DOING}" = "" ] && die "You are trying to do something dangerous. kmail-4.4.11.1-r100 is only for the brave or foolish."
+	ewarn "You are trying to do something dangerous. kmail-4.4.11.1-r100 is only for the brave or foolish."
+}
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		-DWITH_IndicateQt=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}