Add upstream bugfixes

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 89 insertions, 1 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 3362b28f5b7d..ffefd18c39bd 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.222 2012/08/01 22:16:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.223 2012/08/01 22:52:26 dilfridge Exp $
+
+*kaddressbook-4.4.11.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kaddressbook-4.4.11.1-r1.ebuild,
+  +files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.p
+  atch:
+  Add upstream bugfixes
 
 *kaddressbook-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 000000000000..3382706be3a8
--- /dev/null
+++ b/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,35 @@
+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/kaddressbook/main.cpp b/kaddressbook/main.cpp
+index 200f8ec..e4cb3f7 100644
+--- a/kaddressbook/main.cpp
++++ b/kaddressbook/main.cpp
+@@ -49,7 +49,7 @@ int main( int argc, char **argv )
+   MainWindow *window = new MainWindow;
+   window->show();
+ 
+-#if !KDE_IS_VERSION(4,6,0)
++#if !KDE_IS_VERSION(4,6,2)
+   if ( !Akonadi::Control::start( window ) ) {
+     //TODO: add message box after string freeze
+     kWarning() << "Unable to start Akonadi server, exit application";
+-- 
+1.7.9.2
+
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..2e213f744448
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild,v 1.1 2012/08/01 22:52:26 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	libkleo/
+"
+
+KMLOADLIBS="libkdepim"
+
+PATCHES=( "${FILESDIR}/4.4/"0002-*.patch )
+
+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
+}