diff options
5 files changed, 199 insertions, 0 deletions
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest index 42fd8e2a655..e59a50acd96 100644 --- a/kde-base/kdepim-runtime/Manifest +++ b/kde-base/kdepim-runtime/Manifest @@ -1,2 +1,3 @@ DIST kdepim-runtime-4.11.97.tar.xz 1191348 SHA256 319aa19185bbbb39281c30c444d052b62cd4f8094475caee51174c8bfc62585c SHA512 1eacadbb269224b47f4c3cab783890e7be4bd8b2e9382f25e85eac372a0d2e163da40b9ce5a27683680b055fb9fc3608928bb5abb9d0d20fdadc8919faff1d78 WHIRLPOOL e3753c8b0240488d46b86234597a21771eb18bfc35c1e708cb80d3bd80dd8a98190e9e20a7a3fb32b43a9f5ef19ff8d01bda34c8734191e2848fbb7d4fc3bd7c DIST kdepim-runtime-4.12.0.tar.xz 1191308 SHA256 e362f9c35f1fc8f7cdc1aad13991e7813d03de2279de8841654b81e50847ce5f SHA512 4060067133dbbf838c05452b950e9bb12570138509cd585e299ac4908cbf8d10be4f10699848d3c15562fcd69d2b805e6153235931133638375bdc170867e668 WHIRLPOOL c09e5beacfaf48c23414aba92c43f94a3134830fc4c4c59a3cd8ce3e7027cde8ec3641572eaaea78a2528a4fe6511ddc128ce72c02d85db957d339928d2a1aff +DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6 SHA512 37f0de7b37ef1d4b116c258e35644f99a6734082cdd5a984962246dc58ab9124020cdd31350a06058e067b0ea3fcddbd864beef6dbb13ca529b637a2a51071ad WHIRLPOOL c1fe887ebc1162aab17cda15f294b94ec06e3690221647fabe0fe2ab7ae718f2624bf100cc068771744ec4a951c539004ee2139bae965e32ac49002c66929b71 diff --git a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch new file mode 100644 index 00000000000..662f38f1726 --- /dev/null +++ b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch @@ -0,0 +1,24 @@ +From ab29b74fe8ec830c6d4c896900939c98d22c0e96 Mon Sep 17 00:00:00 2001 +From: Thomas McGuire <mcguire@kde.org> +Date: Mon, 25 Apr 2011 00:36:43 +0100 +Subject: [PATCH 1/2] Less warnings when building against a new kdepimlibs. + +--- + kresources/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt +index 9fd1b37..a746796 100644 +--- a/kresources/CMakeLists.txt ++++ b/kresources/CMakeLists.txt +@@ -1,4 +1,7 @@ + add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) ++add_definitions(-DWANT_DEPRECATED_KCAL_API) ++add_definitions(-DWANT_DEPRECATED_KABC_API) ++add_definitions(-DWANT_DEPRECATED_KRESOURCE_API) + include_directories (${kdepim-runtime_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT_QTDBUS_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/shared) + + # include (ConfigureChecks.cmake) +-- +1.7.9.2 + diff --git a/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch b/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch new file mode 100644 index 00000000000..df3967cecf5 --- /dev/null +++ b/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch @@ -0,0 +1,119 @@ +From 8f85db2a32cab4bad987b2100424fbaf42f6ed26 Mon Sep 17 00:00:00 2001 +From: Thomas McGuire <mcguire@kde.org> +Date: Mon, 25 Apr 2011 00:50:43 +0100 +Subject: [PATCH 2/2] Implement readOnly() for Akonadi kresources. + +Now it doesn't ask me if I want to save in my local calendar +or in my Facebook folder anymore, since only the local calendar +is writeable. + +REVIEW: 101229 +--- + kresources/kabc/resourceakonadi.cpp | 5 +++++ + kresources/kabc/resourceakonadi.h | 2 ++ + kresources/kcal/resourceakonadi.cpp | 5 +++++ + kresources/kcal/resourceakonadi.h | 2 ++ + kresources/shared/sharedresourceprivate.h | 5 +++++ + kresources/shared/subresourcemodel.h | 13 +++++++++++++ + 6 files changed, 32 insertions(+) + +diff --git a/kresources/kabc/resourceakonadi.cpp b/kresources/kabc/resourceakonadi.cpp +index d2ea349..39edf6e 100644 +--- a/kresources/kabc/resourceakonadi.cpp ++++ b/kresources/kabc/resourceakonadi.cpp +@@ -249,5 +249,10 @@ void ResourceAkonadi::setSubresourceCompletionWeight( const QString &subResource + } + } + ++bool ResourceAkonadi::readOnly() const ++{ ++ return d->isReadOnly(); ++} ++ + #include "resourceakonadi.moc" + // kate: space-indent on; indent-width 2; replace-tabs on; +diff --git a/kresources/kabc/resourceakonadi.h b/kresources/kabc/resourceakonadi.h +index f2075a4..747a0c1 100644 +--- a/kresources/kabc/resourceakonadi.h ++++ b/kresources/kabc/resourceakonadi.h +@@ -73,6 +73,8 @@ class ResourceAkonadi : public ResourceABC, public SharedResourceIface + virtual QStringList subresources() const; + virtual QMap<QString, QString> uidToResourceMap() const; + ++ virtual bool readOnly() const; ++ + StoreConfigIface &storeConfig(); + + public Q_SLOTS: +diff --git a/kresources/kcal/resourceakonadi.cpp b/kresources/kcal/resourceakonadi.cpp +index d2c9415..9552ffa 100644 +--- a/kresources/kcal/resourceakonadi.cpp ++++ b/kresources/kcal/resourceakonadi.cpp +@@ -432,6 +432,11 @@ void ResourceAkonadi::doClose() + d->doClose(); + } + ++bool ResourceAkonadi::readOnly() const ++{ ++ return d->isReadOnly(); ++} ++ + #include "resourceakonadi.moc" + + // kate: space-indent on; indent-width 2; replace-tabs on; +diff --git a/kresources/kcal/resourceakonadi.h b/kresources/kcal/resourceakonadi.h +index a220616..f7ee77d 100644 +--- a/kresources/kcal/resourceakonadi.h ++++ b/kresources/kcal/resourceakonadi.h +@@ -140,6 +140,8 @@ class ResourceAkonadi : public ResourceCalendar, public SharedResourceIface + + virtual QString infoText() const; + ++ virtual bool readOnly() const; ++ + protected: + virtual bool doLoad( bool syncCache ); + +diff --git a/kresources/shared/sharedresourceprivate.h b/kresources/shared/sharedresourceprivate.h +index 8019204..ea551d5 100644 +--- a/kresources/shared/sharedresourceprivate.h ++++ b/kresources/shared/sharedresourceprivate.h +@@ -68,6 +68,11 @@ class SharedResourcePrivate : public ResourcePrivateBase + return mModel.subResource( id ); + } + ++ bool isReadOnly() const ++ { ++ return !mModel.hasWritableSubResource(); ++ } ++ + protected: + SubResourceModelClass mModel; + +diff --git a/kresources/shared/subresourcemodel.h b/kresources/shared/subresourcemodel.h +index b6f4dc2..956a0ff 100644 +--- a/kresources/shared/subresourcemodel.h ++++ b/kresources/shared/subresourcemodel.h +@@ -97,6 +97,19 @@ class SubResourceModel : public AbstractSubResourceModel + return result; + } + ++ bool hasWritableSubResource() const ++ { ++ Akonadi::MimeTypeChecker mimeChecker; ++ mimeChecker.setWantedMimeTypes( SubResourceClass::supportedMimeTypes() ); ++ ++ foreach ( const SubResourceClass *subResource, mSubResourcesByColId ) { ++ if ( subResource->isWritable() && mimeChecker.isWantedCollection( subResource->collection() ) ) { ++ return true; ++ } ++ } ++ return false; ++ } ++ + SubResourceClass *findSubResourceForMappedItem( const QString &kresId ) const + { + foreach ( SubResourceClass *subResource, mSubResourcesByColId ) { +-- +1.7.9.2 + 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 00000000000..35c88a39c04 --- /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 00000000000..abad15c2c51 --- /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-r1.ebuild,v 1.13 2013/10/10 05:26:49 creffett Exp $ + +EAPI=4 + +if [[ ${PV} = *9999* ]]; then + KMNAME="kdepim" + KMMODULE="runtime" + inherit kde4-meta +else + inherit kde4-base +fi + +DESCRIPTION="KDE PIM runtime plugin collection" +KEYWORDS="~amd64 ~ppc ~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 'semantic-desktop(+)' 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*.patch +) |