[kde-base/kdepim-runtime-4.4.11.2-r2] fix build against new akonadi-xml libraries

4 files changed, 89 insertions, 1 deletions

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 00000000000..3383024c4aa
--- /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 00000000000..5a9b886e7a5
--- /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 00000000000..1358a02b38c
--- /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/kdepim-runtime-4.4.11.1-r2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
index abad15c2c51..c6e3a5a4943 100644
--- 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
@@ -40,5 +40,5 @@ add_blocker akonadi '<4.3.90'
 
 PATCHES=(
 	"${FILESDIR}/4.4/"000[1-2]-*.patch
-	"${FILESDIR}/4.4/"999*.patch
+	"${FILESDIR}/4.4/"999[6-9]-*.patch
 )