summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2013-12-18 20:06:58 +0000
committerJohannes Huber <johu@gentoo.org>2013-12-18 20:06:58 +0000
commite64b5f0efac91285e49c377f449c9b132e4c6eee (patch)
treea9827f428f40c0acc873d36e299245ec69d98296 /kde-base
parentVersion bump KDE SC 4.12.0 (diff)
downloadgentoo-2-e64b5f0efac91285e49c377f449c9b132e4c6eee.tar.gz
gentoo-2-e64b5f0efac91285e49c377f449c9b132e4c6eee.tar.bz2
gentoo-2-e64b5f0efac91285e49c377f449c9b132e4c6eee.zip
Oldpim revision bump adds compat patches for KDE SC 4.12.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdepim-runtime/ChangeLog13
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch12
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch23
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch53
-rw-r--r--kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch11
-rw-r--r--kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild44
6 files changed, 155 insertions, 1 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 7307ce333c61..0a3cca896982 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for kde-base/kdepim-runtime
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.176 2013/12/18 19:57:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.177 2013/12/18 20:06:58 johu Exp $
+
+*kdepim-runtime-4.4.11.1-r2 (18 Dec 2013)
+
+ 18 Dec 2013; Johannes Huber <johu@gentoo.org>
+ +files/4.4/9996-no-knut-anymore.patch,
+ +files/4.4/9997-the-future-is-here.patch,
+ +files/4.4/9998-external-akonadi-xml.patch,
+ +files/4.4/9999-no-akonadi-xml.patch, +kdepim-runtime-4.4.11.1-r2.ebuild,
+ files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch,
+ files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch:
+ Oldpim revision bump adds compat patches for KDE SC 4.12.
*kdepim-runtime-4.12.0 (18 Dec 2013)
diff --git a/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch b/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
new file mode 100644
index 000000000000..3383024c4aae
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9996-no-knut-anymore.patch
@@ -0,0 +1,12 @@
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index d436115..8f1033c 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -30,7 +30,6 @@ add_subdirectory( ical )
+ add_subdirectory( imap )
+ add_subdirectory( kabc )
+ add_subdirectory( kcal )
+-add_subdirectory( knut )
+ add_subdirectory( kolabproxy )
+ add_subdirectory( localbookmarks )
+ add_subdirectory( maildir )
diff --git a/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch b/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
new file mode 100644
index 000000000000..5a9b886e7a5e
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9997-the-future-is-here.patch
@@ -0,0 +1,23 @@
+diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp
+--- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.cpp 2013-12-15 15:41:43.629536906 +0100
++++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.cpp 2013-12-15 15:42:33.492539695 +0100
+@@ -34,7 +34,6 @@
+ #include <QStringList>
+
+ using namespace Akonadi;
+-using namespace AkonadiFuture;
+
+ template <typename T> QTextStream& operator<<( QTextStream &s, const QSet<T> &set )
+ {
+diff -ruN kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h
+--- kdepim-runtime-4.4.11.1.orig/resourcetester/xmloperations.h 2013-12-15 15:41:43.629536906 +0100
++++ kdepim-runtime-4.4.11.1/resourcetester/xmloperations.h 2013-12-15 15:42:22.195539063 +0100
+@@ -114,7 +114,7 @@
+
+ private:
+ Akonadi::Collection::List mRoots;
+- AkonadiFuture::XmlDocument mDocument;
++ Akonadi::XmlDocument mDocument;
+ QString mFileName;
+ QString mErrorMsg;
+ CollectionFields mCollectionFields;
diff --git a/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
new file mode 100644
index 000000000000..1358a02b38cc
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9998-external-akonadi-xml.patch
@@ -0,0 +1,53 @@
+From ae557eb6f7c106012a96e6dcc86bc15c71c48c7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
+Date: Wed, 9 Oct 2013 13:17:28 +0200
+Subject: [PATCH] Fix build of resourcetester against akonadi-xml in kdepimlibs
+
+---
+ resourcetester/CMakeLists.txt | 2 +-
+ resourcetester/xmloperations.cpp | 2 +-
+ resourcetester/xmloperations.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/resourcetester/CMakeLists.txt b/resourcetester/CMakeLists.txt
+index 74bd851..c9d0313 100644
+--- a/resourcetester/CMakeLists.txt
++++ b/resourcetester/CMakeLists.txt
+@@ -20,7 +20,7 @@ set( resourcetester_SRCS
+ kde4_add_executable(resourcetester ${resourcetester_SRCS})
+
+ target_link_libraries( resourcetester
+- akonadi-xml
++ ${KDEPIMLIBS_AKONADI_XML_LIBS}
+ ${KDEPIMLIBS_AKONADI_LIBS}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+diff --git a/resourcetester/xmloperations.cpp b/resourcetester/xmloperations.cpp
+index 9bc5202..59b5754 100644
+--- a/resourcetester/xmloperations.cpp
++++ b/resourcetester/xmloperations.cpp
+@@ -25,7 +25,7 @@
+ #include <akonadi/collectionfetchscope.h>
+ #include <akonadi/itemfetchjob.h>
+ #include <akonadi/itemfetchscope.h>
+-#include "xml/xmlwritejob.h"
++#include <akonadi/xml/xmlwritejob.h>
+
+ #include <KDebug>
+
+diff --git a/resourcetester/xmloperations.h b/resourcetester/xmloperations.h
+index c32b622..e75ad59 100644
+--- a/resourcetester/xmloperations.h
++++ b/resourcetester/xmloperations.h
+@@ -22,7 +22,7 @@
+
+ #include <akonadi/collection.h>
+ #include <akonadi/item.h>
+-#include "xml/xmldocument.h"
++#include <akonadi/xml/xmldocument.h>
+
+ #include <QtCore/QMetaEnum>
+ #include <QtCore/QObject>
+--
+1.8.5.1
+
diff --git a/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch b/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
new file mode 100644
index 000000000000..35c88a39c048
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/9999-no-akonadi-xml.patch
@@ -0,0 +1,11 @@
+diff -ruN kdepim-runtime-4.4.11.1.orig/CMakeLists.txt kdepim-runtime-4.4.11.1/CMakeLists.txt
+--- kdepim-runtime-4.4.11.1.orig/CMakeLists.txt 2011-04-21 15:41:44.000000000 +0200
++++ kdepim-runtime-4.4.11.1/CMakeLists.txt 2013-12-15 14:29:33.078294758 +0100
+@@ -102,7 +102,6 @@
+ ############### Now, we add the components ###############
+
+ add_subdirectory(libkdepim-copy)
+-add_subdirectory(xml)
+ add_subdirectory(resourcetester)
+ add_subdirectory(resources)
+ add_subdirectory(agents)
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
new file mode 100644
index 000000000000..706b17ef24b2
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild,v 1.1 2013/12/18 20:06:58 johu Exp $
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ KMNAME="kdepim"
+ KMMODULE="runtime"
+ inherit kde4-meta
+else
+ inherit kde4-base
+fi
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs
+
+COMMON_DEPEND="
+ app-misc/strigi
+ >=app-office/akonadi-server-1.3.1
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ $(add_kdebase_dep kdelibs 'semantic-desktop' 4.12)
+ $(add_kdebase_dep kdepimlibs '' 4.12)
+ $(add_kdebase_dep libkdepim)
+ x11-misc/shared-mime-info
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker akonadi '<4.3.90'
+
+PATCHES=(
+ "${FILESDIR}/4.4/"000[1-2]-*.patch
+ "${FILESDIR}/4.4/"999[6-9]-*.patch
+)