- Update to 0.3.1.

This will be the last release: starting from KDE SC 4.9, the
project will be part of deskutils/kdepim4-runtime.

4 files changed, 5 insertions, 48 deletions

diff --git a/databases/akonadi-google/Makefile b/databases/akonadi-google/Makefile
index 6204453c86ec..d625b2ddf6af 100644
--- a/databases/akonadi-google/Makefile
+++ b/databases/akonadi-google/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	akonadi-google
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.1
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.progdan.cz/wp-content/uploads/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Akonadi resources for accessing Google services
diff --git a/databases/akonadi-google/distinfo b/databases/akonadi-google/distinfo
index 88de4669116e..d73b8bdd00e6 100644
--- a/databases/akonadi-google/distinfo
+++ b/databases/akonadi-google/distinfo
@@ -1,2 +1,2 @@
-SHA256 (akonadi-google-0.3.tar.gz) = 797430ad841fd15759f8bbea6849456c3913e8c6e2c48440b670d96528c009a2
-SIZE (akonadi-google-0.3.tar.gz) = 155492
+SHA256 (akonadi-google-0.3.1.tar.gz) = bba88dbddb6fd14e75bea3cc08a1a66615a3a079299cac4c243d8ab86ef7aec0
+SIZE (akonadi-google-0.3.1.tar.gz) = 87677
diff --git a/databases/akonadi-google/files/patch-clang.diff b/databases/akonadi-google/files/patch-clang.diff
deleted file mode 100644
index 2198d2f1c2c3..000000000000
--- a/databases/akonadi-google/files/patch-clang.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Christophe Giboudeaux <cgiboudeaux@gmx.com>
-Date: Mon, 02 Apr 2012 12:38:56 +0000
-Subject: Build with Clang.
-X-Git-Url: http://quickgit.kde.org/?p=akonadi-google.git&amp;a=commitdiff&amp;h=3e0a93e1b24cd7b6e394cf76d153c428246f9fa9
----
-Build with Clang.
-Exception is ambiguous. It's defined in both common.h and kdepimlibs/akonadi/exception.h
----
-
-
---- ./calendar/calendarresource.cpp
-+++ ./calendar/calendarresource.cpp
-@@ -141,7 +141,7 @@ void CalendarResource::configure(WId win
-         try {
-             Auth *auth = Auth::instance();
-             m_account = auth->getAccount(Settings::self()->account());
--        } catch (Exception::BaseException &e) {
-+        } catch (KGoogle::Exception::BaseException &e) {
-             emit status(Broken, e.what());
-             delete settingsDialog;
-             return;
-
---- ./contacts/contactsresource.cpp
-+++ ./contacts/contactsresource.cpp
-@@ -87,7 +87,7 @@ ContactsResource::ContactsResource(const
-     if (!Settings::self()->account().isEmpty()) {
-         try {
-             m_account = auth->getAccount(Settings::self()->account());
--        } catch (Exception::BaseException &e) {
-+        } catch (KGoogle::Exception::BaseException &e) {
-             emit status(Broken, e.what());
-             return;
-         }
-@@ -137,7 +137,7 @@ void ContactsResource::configure(WId win
-         try {
-             Auth *auth = Auth::instance();
-             m_account = auth->getAccount(Settings::self()->account());
--        } catch (Exception::BaseException &e) {
-+        } catch (KGoogle::Exception::BaseException &e) {
-             emit status(Broken, e.what());
-             delete settingsDialog;
-             return;
-
diff --git a/databases/akonadi-google/pkg-plist b/databases/akonadi-google/pkg-plist
index da390b8509dd..5e54da0a5aef 100644
--- a/databases/akonadi-google/pkg-plist
+++ b/databases/akonadi-google/pkg-plist
@@ -24,7 +24,7 @@ include/libkgoogle/services/tasks.h
 include/libkgoogle/ui/accountscombo.h
 lib/libkgoogle.so
 lib/libkgoogle.so.0
-lib/libkgoogle.so.0.3.0
+lib/libkgoogle.so.0.3.1
 libdata/pkgconfig/libkgoogle.pc
 share/akonadi/agents/googlecalendarresource.desktop
 share/akonadi/agents/googlecontactsresource.desktop