3 files changed, 2 insertions, 80 deletions

diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 8d464c35fc7e..7458b3d25173 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.4/kdepimlibs-4.10.4.tar.xz) = f82a8b1b6515744a55f00a4b6bfdd5c4d8c2da184bc9488c298904520f04e626
-SIZE (KDE/4.10.4/kdepimlibs-4.10.4.tar.xz) = 2714688
+SHA256 (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06
+SIZE (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = 2986664
diff --git a/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h b/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h
deleted file mode 100644
index a2d816e29515..000000000000
--- a/deskutils/kdepimlibs4/files/patch-akonadi__resourcebase.h
+++ /dev/null
@@ -1,55 +0,0 @@
-commit e65bae22cf6da5c0db468691a8037ac81ffce291
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sun Jun 2 02:29:49 2013 +0300
-
-    Correctly expose that ResourceState is a friend class.
-    
-    ResourceState is a class that lives in kdepim-runtime and is outside the
-    Akonadi namespace.
-    
-    clang < 3.3 and all versions of GCC erroneously consider the friend
-    declaration in
-    
-      namespace N {
-        class C {
-          friend class A;
-        };
-      }
-    
-      class A {
-      };
-    
-    to refer to the class A outside namespace N (technically speaking, this is
-    item 3 of section 7.3.1.2 of the C++ standard). clang 3.3 fixes this
-    behavior and makes the build of kdepim-runtime fail.
-    
-    Fix it by explicitly referring to ::ResourceState in the friend declaration.
-    
-    Alternatively, we could remove the friend declaration and make
-    ResourceState::collectionsRetrieved use ImapResource::Append instead of
-    Akonadi::ResourceBase::Append (since ImapResource also declares
-    ResourceState as a friend).
-    
-    REVIEW: 110777
-
-diff --git a/akonadi/resourcebase.h b/akonadi/resourcebase.h
-index 2e112b5..cb25ef2 100644
---- akonadi/resourcebase.h
-+++ akonadi/resourcebase.h
-@@ -32,6 +32,7 @@
- 
- class KJob;
- class Akonadi__ResourceAdaptor;
-+class ResourceState;
- 
- namespace Akonadi {
- 
-@@ -566,7 +567,7 @@ class AKONADI_EXPORT ResourceBase : public AgentBase
-     void setHierarchicalRemoteIdentifiersEnabled( bool enable );
- 
-     friend class ResourceScheduler;
--    friend class ResourceState;
-+    friend class ::ResourceState;
- 
-     /**
-      * Describes the scheduling priority of a task that has been queued
diff --git a/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt
deleted file mode 100644
index acf0c3d517be..000000000000
--- a/deskutils/kdepimlibs4/files/patch-kalarmcal__CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-commit b36db9f663ea0828d81245314e9f7465c751cd85
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sun Jun 23 20:49:17 2013 +0300
-
-    Enable exceptions in kalarmcal/ as well.
-    
-    clang seems to be more strict than gcc, and complains about exceptions being
-    disabled despite akonadi/itempayloadinternals_p.h being indirectly included.
-
-diff --git a/kalarmcal/CMakeLists.txt b/kalarmcal/CMakeLists.txt
-index 3f27597..7c6a4fa 100644
---- kalarmcal/CMakeLists.txt
-+++ kalarmcal/CMakeLists.txt
-@@ -31,6 +31,9 @@ set(kalarmcal_LIB_SRCS
-     version.cpp
-    )
- if(NOT USE_KRESOURCES)
-+    # The includes in akonadi/ use exceptions, we must enable them here for clang to be happy.
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-+
-     set(kalarmcal_LIB_SRCS ${kalarmcal_LIB_SRCS}
- 	collectionattribute.cpp
- 	compatibilityattribute.cpp