<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118899] trunk/dports/gnome/evolution-data-server</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118899">118899</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-13 16:49:34 -0700 (Sun, 13 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>evolution-data-server: update to version 3.12.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserverPortfile">trunk/dports/gnome/evolution-data-server/Portfile</a></li>
<li><a href="#trunkdportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff">trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff</a></li>
<li><a href="#trunkdportsgnomeevolutiondataserverfilespatchconfigureacdiff">trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserverfilespatchcalendarlibedatacalecalbackendintervaltreecdiff">trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomeevolutiondataserver">trunk/dports/gnome/evolution-data-server/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomeevolutiondataserver"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/evolution-data-server</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-118732
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server:114069-118152
</span><a id="trunkdportsgnomeevolutiondataserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/Portfile (118898 => 118899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/Portfile 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/Portfile 2014-04-13 23:49:34 UTC (rev 118899)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name evolution-data-server
</span><del>-version 3.10.4
</del><ins>+version 3.12.1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Addressbook and calender libs for GNOME.
</span><span class="cx"> long_description Evolution Data Server provides a central location for \
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 9bcb9c1bd882bca58e6d3f26767de86251b53966 \
- sha256 5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d
</del><ins>+checksums rmd160 9f95a5093cfaea2a78b217fbc0928eeb03c858fc \
+ sha256 8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:gnome-common \
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> port:gnome-online-accounts \
</span><span class="cx"> port:gobject-introspection \
</span><span class="cx"> port:sqlite3 \
</span><del>- port:vala
</del><ins>+ port:vala \
+ port:db46
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><del>- patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff \
</del><span class="cx"> patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
</span><span class="cx">
</span><span class="cx"> # update m4/intltool.m4 and autoreconf
</span><span class="lines">@@ -55,9 +55,12 @@
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="cx">
</span><ins>+configure.env-append \
+ DB_CFLAGS="-I${prefix}/include/db46" \
+ DB_LIBS="-L${prefix}/lib/db46 -ldb"
+
</ins><span class="cx"> configure.args --enable-smime \
</span><span class="cx"> --enable-ipv6 \
</span><del>- --enable-nntp \
</del><span class="cx"> --enable-weather \
</span><span class="cx"> --enable-google \
</span><span class="cx"> --enable-goa \
</span></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilespatchaddressbooklibebookcontactsephonenumberprivatecppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff (118898 => 118899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2014-04-13 23:49:34 UTC (rev 118899)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2013-08-27 02:10:57.000000000 -0700
-+++ addressbook/libebook-contacts/e-phone-number-private.cpp 2013-08-27 02:16:53.000000000 -0700
-@@ -122,9 +122,13 @@
</del><ins>+--- addressbook/libebook-contacts/e-phone-number-private.cpp.orig 2014-01-07 06:48:13.000000000 -0800
++++ addressbook/libebook-contacts/e-phone-number-private.cpp 2014-01-24 13:56:09.000000000 -0800
+@@ -120,9 +120,13 @@
</ins><span class="cx"> /* Extract two-letter country code from current locale id if needed.
</span><span class="cx"> * From outside this is a C library, so we better consult the
</span><span class="cx"> * C infrastructure instead of std::locale, which might divert. */
</span></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilespatchcalendarlibedatacalecalbackendintervaltreecdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff (118898 => 118899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2014-04-13 23:49:34 UTC (rev 118899)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2013-08-23 13:52:14.000000000 -0700
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2013-08-23 13:52:33.000000000 -0700
-@@ -26,7 +26,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <malloc/malloc.h>
-
- #include "e-cal-backend-intervaltree.h"
-
</del></span></pre></div>
<a id="trunkdportsgnomeevolutiondataserverfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff (118898 => 118899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-04-13 23:49:25 UTC (rev 118898)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2014-04-13 23:49:34 UTC (rev 118899)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2013-12-08 18:41:02.000000000 -0800
-+++ configure.ac 2014-02-10 16:57:44.000000000 -0800
-@@ -322,8 +322,8 @@
</del><ins>+--- configure.ac.orig 2014-01-17 12:19:46.000000000 -0800
++++ configure.ac 2014-02-10 20:05:35.000000000 -0800
+@@ -317,8 +317,8 @@
</ins><span class="cx">
</span><span class="cx"> dnl This must appear after AC_CANONICAL_HOST, which defines $host.
</span><span class="cx"> case "$host" in
</span><span class="lines">@@ -11,14 +11,14 @@
</span><span class="cx"> ;
</span><span class="cx"> *)
</span><span class="cx"> LDFLAGS="$LDFLAGS -Wl,--no-undefined"
</span><del>-@@ -546,8 +546,8 @@
</del><ins>+@@ -605,8 +605,8 @@
+ AS_HELP_STRING([--with-libdb=PREFIX],
</ins><span class="cx"> [Prefix where libdb is installed]),
</span><del>- [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
-
--DB_CFLAGS="-I$libdb_prefix/include"
--DB_LIBS="-L$libdb_prefix/lib -ldb"
-+DB_CFLAGS="-I$prefix/include/db46"
-+DB_LIBS="-L$prefix/lib/db46 -ldb"
-
- AC_MSG_CHECKING([Berkeley DB])
- save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
</del><ins>+ [
+- DB_CFLAGS="-I$withval/include"
+- DB_LIBS="-L$withval/lib -ldb"
++ DB_CFLAGS="-I$prefix/include/db46"
++ DB_LIBS="-L$prefix/lib/db46 -ldb"
+ ],
+ [
+ if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
</ins></span></pre>
</div>
</div>
</body>
</html>