[91686] trunk/dports/devel/akonadi

[snc at macports.org]

Revision: 91686
          https://trac.macports.org/changeset/91686
Author:   snc at macports.org
Date:     2012-04-07 19:08:25 -0700 (Sat, 07 Apr 2012)
Log Message:
-----------
akonadi: update to 1.7.2, patch for clang BKO#297696

Modified Paths:
--------------
    trunk/dports/devel/akonadi/Portfile

Added Paths:
-----------
    trunk/dports/devel/akonadi/files/
    trunk/dports/devel/akonadi/files/patch-server-src-nepomuk-queryserviceclient.h.diff

Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile	2012-04-08 01:06:46 UTC (rev 91685)
+++ trunk/dports/devel/akonadi/Portfile	2012-04-08 02:08:25 UTC (rev 91686)
@@ -5,7 +5,7 @@
 PortGroup           kde4    1.1
 
 name                akonadi
-version             1.6.0
+version             1.7.2
 categories          devel kde kde4
 maintainers         nomaintainer
 license             LGPL-2+
@@ -17,8 +17,8 @@
 master_sites        kde:stable/${name}/src/
 use_bzip2           yes
 
-checksums           sha1    a95b043a26aba5d22a00d1c7632531db3c578e03 \
-                    rmd160  70ba7c4e6fcfec6506beb8d15f52d77d540a8740
+checksums           sha1    6aef88b46f8f7ce2dbdfb3641bce2d0bb733f181 \
+                    rmd160  f6c0b4173fd7ea4b60a9e311984e35ce638e8ec7
 
 depends_lib-append  port:soprano \
 					port:boost \
@@ -26,6 +26,7 @@
 
 depends_run-append  path:libexec/mysqld:mysql5-server
 
+patchfiles          patch-server-src-nepomuk-queryserviceclient.h.diff
 post-patch {
     # fix '#include "utils.h"' -> "src/utils.h" to avoid a conflict
     # with the 'utils.h' header installed by the cdparanoia port
@@ -36,6 +37,9 @@
     }
 }
 
+configure.args-append   -std=C89
+configure.args-append   -DDATABASE_BACKEND=MYSQL -DPOSTGRES_PATH=Off
+
 platform darwin 9 {
     if {[info exists universal_target] && ${universal_target} == "10.4"} {
 # Needed if compiling for 10.4 universal on 10.5

Added: trunk/dports/devel/akonadi/files/patch-server-src-nepomuk-queryserviceclient.h.diff
===================================================================
--- trunk/dports/devel/akonadi/files/patch-server-src-nepomuk-queryserviceclient.h.diff	                        (rev 0)
+++ trunk/dports/devel/akonadi/files/patch-server-src-nepomuk-queryserviceclient.h.diff	2012-04-08 02:08:25 UTC (rev 91686)
@@ -0,0 +1,20 @@
+--- server/src/nepomuk/queryserviceclient.h.orig	2012-04-07 21:51:02.000000000 -0400
++++ server/src/nepomuk/queryserviceclient.h	2012-04-07 21:54:05.000000000 -0400
+@@ -78,7 +78,7 @@
+              *
+              * \sa QueryParser
+              */
+-            bool query( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool query( const QString& query, const QHash<QString, QString> &encodedRps = (QHash<QString, QString>()));
+ 
+             /**
+              * Start a query using the Nepomuk user query language.
+@@ -96,7 +96,7 @@
+              * 
+              * \sa query(const QString&), close()
+              */
+-            bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() );
++            bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = (QHash<QString, QString>()));
+ 
+             /**
+              * Close the client, thus stop to monitor the query
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120407/603b2b7a/attachment-0001.html>