[113261] trunk/dports/gnome/evolution-data-server
devans at macports.org
devans at macports.org
Wed Nov 13 00:38:44 PST 2013
Revision: 113261
https://trac.macports.org/changeset/113261
Author: devans at macports.org
Date: 2013-11-13 00:38:44 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
evolution-data-server: merge version 3.10.1 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/evolution-data-server/Portfile
trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff
trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
Added Paths:
-----------
trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
Removed Paths:
-------------
trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-Makefile.am.diff
trunk/dports/gnome/evolution-data-server/files/patch-libgdata07-compat.diff
trunk/dports/gnome/evolution-data-server/files/patch-m4-evo_krb5_support.m4.diff
Property Changed:
----------------
trunk/dports/gnome/evolution-data-server/
Property changes on: trunk/dports/gnome/evolution-data-server
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/evolution-data-server:108269-113174
Modified: trunk/dports/gnome/evolution-data-server/Portfile
===================================================================
--- trunk/dports/gnome/evolution-data-server/Portfile 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/Portfile 2013-11-13 08:38:44 UTC (rev 113261)
@@ -4,7 +4,7 @@
PortSystem 1.0
name evolution-data-server
-version 2.32.3
+version 3.10.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Addressbook and calender libs for GNOME.
@@ -17,73 +17,71 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 adc8b07aef41a89d16fc426541c12190a3688b8f \
- sha256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
+checksums rmd160 baad1b88955b4f0d3691d6bd20963e325890968c \
+ sha256 a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5
depends_build port:pkgconfig \
+ port:gnome-common \
port:intltool \
port:gtk-doc
-depends_lib port:gconf \
- port:kerberos5 \
- port:libcomerr \
- port:libgnome-keyring \
- port:libgdata \
+depends_lib port:gtk3 \
+ port:libxml2 \
+ port:libsoup \
+ port:libsecret \
+ port:gcr \
+ port:libiconv \
+ port:nss \
+ port:nspr \
port:libgweather \
port:libical \
- port:nss \
- port:gnuregex \
- port:db46
+ port:libgdata \
+ port:gnome-online-accounts \
+ port:gobject-introspection \
+ port:sqlite3 \
+ port:vala
patchfiles patch-configure.ac.diff \
- patch-m4-evo_krb5_support.m4.diff \
- patch-libgdata07-compat.diff \
- patch-calendar-libedata-cal-Makefile.am.diff \
patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff \
- patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
+ patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
-use_autoreconf yes
-autoreconf.args -fvi
+use_autoreconf yes
+autoreconf.args -fvi
configure.args \
- --enable-static \
- --enable-smime \
- --enable-gnome-keyring \
- --enable-ipv6 \
- --enable-nntp \
- --enable-calendar \
- --with-nspr-includes=${prefix}/include/nspr \
- --with-nspr-libs=${prefix}/lib/nspr \
- --with-nss-includes=${prefix}/include/nss \
- --with-nss-libs=${prefix}/lib/nss \
- --with-krb5=/usr \
- --disable-gtk3 \
- --disable-silent-rules \
- --disable-schemas-install
+ --enable-smime \
+ --enable-ipv6 \
+ --enable-nntp \
+ --enable-weather \
+ --enable-google \
+ --enable-goa \
+ --enable-introspection=yes \
+ --enable-vala-bindings \
+ --with-nspr-includes=${prefix}/include/nspr \
+ --with-nspr-libs=${prefix}/lib/nspr \
+ --with-nss-includes=${prefix}/include/nss \
+ --with-nss-libs=${prefix}/lib/nss \
+ --with-krb5=/usr \
+ --disable-uoa \
+ --disable-silent-rules \
+ --disable-schemas-compile
#
# port nss is not universal
#
+
universal_variant no
-platform darwin 8 {
- post-patch {
- reinplace "s|#include <stdio.h>|#include <stdio.h>\\\n#include <sys/types.h>|g" \
- ${worksrcpath}/camel/camel-block-file.h
- }
- configure.args-delete --with-krb5=/usr
- configure.args-append --without-krb5
+variant phonenumber description {Phone number parsing/validation using libphonenumber} {
+ depends_lib-append port:libphonenumber-cpp
+ configure.cxxflags-append -DI18N_PHONENUMBERS_USE_BOOST
+ configure.args-append --with-phonenumber=${prefix}/lib
}
-variant gtk_doc description {Build gtk-doc documentation} {
- configure.args-append --enable-gtk-doc
-}
-
post-activate {
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Copied: trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff)
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff (rev 0)
+++ trunk/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -0,0 +1,18 @@
+--- 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 @@
+ /* Extract two-letter country code from current locale id if needed.
+ * From outside this is a C library, so we better consult the
+ * C infrastructure instead of std::locale, which might divert. */
+- if (region_code == NULL || region_code[0] == '\0')
++ if (region_code == NULL || region_code[0] == '\0') {
++#ifdef LC_ADDRESS
+ return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ADDRESS, NULL));
+-
++#else
++ return _e_phone_number_cxx_region_code_from_locale (setlocale (LC_ALL, NULL));
++#endif
++ }
+ return region_code;
+ }
+
Deleted: trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,46 +0,0 @@
---- calendar/backends/caldav/e-cal-backend-caldav.c.orig 2011-04-21 12:35:36.000000000 -0700
-+++ calendar/backends/caldav/e-cal-backend-caldav.c 2013-06-02 23:29:41.000000000 -0700
-@@ -1072,8 +1072,8 @@
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-- (gchar *) buf->buffer->content,
-- buf->buffer->use);
-+ (gchar *) xmlBufContent(buf->buffer),
-+ xmlBufUse(buf->buffer));
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1214,8 +1214,8 @@
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-- (gchar *) buf->buffer->content,
-- buf->buffer->use);
-+ (gchar *) xmlBufContent(buf->buffer),
-+ xmlBufUse(buf->buffer));
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1530,8 +1530,8 @@
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-- (gchar *) buf->buffer->content,
-- buf->buffer->use);
-+ (gchar *) xmlBufContent(buf->buffer),
-+ xmlBufUse(buf->buffer));
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
-@@ -1580,8 +1580,8 @@
- soup_message_set_request (message,
- "application/xml",
- SOUP_MEMORY_COPY,
-- (gchar *) buf->buffer->content,
-- buf->buffer->use);
-+ (gchar *) xmlBufContent(buf->buffer),
-+ xmlBufUse(buf->buffer));
-
- /* Send the request now */
- send_and_handle_redirection (priv->session, message, NULL);
Deleted: trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-Makefile.am.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-Makefile.am.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,12 +0,0 @@
---- calendar/libedata-cal/Makefile.am.orig 2013-05-09 16:06:35.000000000 -0700
-+++ calendar/libedata-cal/Makefile.am 2013-05-09 16:07:56.000000000 -0700
-@@ -161,8 +161,7 @@
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
- libedata-cal-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
-- $(EVOLUTION_CALENDAR_LIBS) \
-- -lgcov
-+ $(EVOLUTION_CALENDAR_LIBS)
-
- .PHONY: coverage
- coverage:
Modified: trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-libedata-cal-e-cal-backend-intervaltree.c.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,10 +1,11 @@
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig 2013-05-09 15:53:05.000000000 -0700
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c 2013-05-09 15:53:34.000000000 -0700
-@@ -26,7 +26,6 @@
+--- 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"
Modified: trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,68 +1,17 @@
---- configure.ac.orig 2011-04-21 12:35:37.000000000 -0700
-+++ configure.ac 2013-06-29 13:30:30.000000000 -0700
-@@ -20,7 +20,7 @@ m4_define([api_version], [1.2])
- dnl Autoconf / Automake Initialization
- AC_PREREQ(2.58)
- AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
--AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar -Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar -Wall foreign])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(README)
- AC_CONFIG_HEADERS(config.h)
-@@ -164,8 +164,7 @@ dnl ******************************
- dnl Compiler Warning Flags
- dnl ******************************
- AS_COMPILER_FLAGS(WARNING_FLAGS,
-- "-DG_DISABLE_DEPRECATED
-- -DPANGO_DISABLE_DEPRECATED
-+ "-DPANGO_DISABLE_DEPRECATED
- -DGDK_PIXBUF_DISABLE_DEPRECATED
- -DGTK_DISABLE_DEPRECATED
- -DG_DISABLE_SINGLE_INCLUDES
-@@ -199,7 +198,7 @@ dnl -Wstrict-aliasing=2
- AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
- AC_SUBST(AM_CPPFLAGS)
+--- configure.ac.orig 2013-04-16 15:56:55.000000000 -0700
++++ configure.ac 2013-08-24 15:28:59.000000000 -0700
+@@ -345,8 +345,8 @@
--LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-+dnl LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-
- dnl ******************************
- dnl Initialize maintainer mode
-@@ -320,16 +319,19 @@ dnl ***********************************
- PKG_CHECK_MODULES(GNOME_PLATFORM,
- [gio-2.0 >= glib_minimum_version
- $GTK_MODULE
-+ gthread-2.0 >= glib_minimum_version
- gconf-2.0 >= gconf_minimum_version
- libxml-2.0 >= libxml_minimum_version
- libsoup-2.4 >= libsoup_minimum_version
- libgdata >= libgdata_minimum_version])
-
--dnl libgdata 0.7 will break API. We're not going to deal with
--dnl that on a stable branch, so cap the supported version.
-+ac_cv_have_gdata_07=no
-+dnl libgdata 0.7 breaks API, thus deal with it.
- if $PKG_CONFIG --atleast-version=0.7 libgdata; then
-- AC_MSG_ERROR([libgdata 0.7 is not supported, use 0.6 instead])
-+ ac_cv_have_gdata_07=yes
-+ AC_DEFINE(HAVE_GDATA_07, 1, [libgdata is 0.7 or higher])
- fi
-+AC_MSG_RESULT([$ac_cv_have_gdata_07])
-
- LIBICAL_REQUIRED=libical_minimum_version
- AC_SUBST(LIBICAL_REQUIRED)
-@@ -337,8 +339,8 @@ AC_SUBST(LIBICAL_REQUIRED)
- dnl ******************************
- dnl regex check
- dnl ******************************
--AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
-- [REGEX_LIBS=-lregex
-+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(gnuregex,regexec,
-+ [REGEX_LIBS=-lgnuregex
- AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
- [AC_MSG_ERROR([No regex library found])])])
- AC_SUBST(REGEX_LIBS)
-@@ -351,8 +353,8 @@ AC_ARG_WITH([libdb],
+ dnl This must appear after AC_CANONICAL_HOST, which defines $host.
+ case "$host" in
+-*openbsd*|*freebsd*)
+- dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
++*openbsd*|*freebsd*|*darwin*)
++ dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd/darwin
+ ;;
+ *)
+ LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+@@ -557,8 +557,8 @@
[Prefix where libdb is installed]),
[libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
@@ -73,12 +22,3 @@
AC_MSG_CHECKING([Berkeley DB])
save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
-@@ -1283,7 +1285,7 @@ dnl ******************************
- LIBSOUP_REQUIRED=libsoup_minimum_version
- AC_SUBST(LIBSOUP_REQUIRED)
-
--EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.4)
-+EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.4 gthread-2.0)
- AC_SUBST(SOUP_CFLAGS)
- AC_SUBST(SOUP_LIBS)
-
Deleted: trunk/dports/gnome/evolution-data-server/files/patch-libgdata07-compat.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-libgdata07-compat.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-libgdata07-compat.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,279 +0,0 @@
---- addressbook/backends/google/e-book-backend-google.c.orig 2013-05-09 15:13:08.000000000 -0700
-+++ addressbook/backends/google/e-book-backend-google.c 2013-05-09 15:20:35.000000000 -0700
-@@ -511,7 +511,11 @@
- GTimeVal updated;
-
- g_assert (g_time_val_from_iso8601 (last_updated, &updated) == TRUE);
-- gdata_query_set_updated_min (query, &updated);
-+ #ifdef HAVE_GDATA_07
-+ gdata_query_set_updated_min (query, updated.tv_sec);
-+ #else
-+ gdata_query_set_updated_min (query, &updated);
-+ #endif
- gdata_contacts_query_set_show_deleted (GDATA_CONTACTS_QUERY (query), TRUE);
- }
-
-@@ -788,11 +792,18 @@
- g_free (xml);
-
- /* Update the contact on the server */
-- new_entry = GDATA_ENTRY (
-- gdata_contacts_service_update_contact (
-- GDATA_CONTACTS_SERVICE (priv->service),
-- GDATA_CONTACTS_CONTACT (entry),
-- NULL, &error));
-+ #ifdef HAVE_GDATA_07
-+ new_entry = gdata_service_update_entry (
-+ GDATA_SERVICE (priv->service),
-+ entry,
-+ NULL, &error);
-+ #else
-+ new_entry = GDATA_ENTRY (
-+ gdata_contacts_service_update_contact (
-+ GDATA_CONTACTS_SERVICE (priv->service),
-+ GDATA_CONTACTS_CONTACT (entry),
-+ NULL, &error));
-+ #endif
- g_object_unref (entry);
-
- if (!new_entry) {
-@@ -1189,6 +1200,12 @@
- E_CONTACT_ORG_UNIT,
- E_CONTACT_TITLE,
- E_CONTACT_ROLE,
-+ #ifdef HAVE_GDATA_07
-+ E_CONTACT_HOMEPAGE_URL,
-+ E_CONTACT_BLOG_URL,
-+ E_CONTACT_BIRTH_DATE,
-+ E_CONTACT_ANNIVERSARY,
-+ #endif
- E_CONTACT_NOTE
- };
-
---- addressbook/backends/google/util.c.orig 2013-05-09 15:25:00.000000000 -0700
-+++ addressbook/backends/google/util.c 2013-05-09 15:33:18.000000000 -0700
-@@ -58,6 +58,57 @@
- return NULL;
- }
-
-+#ifdef HAVE_GDATA_07
-+static void
-+remove_anniversary (GDataContactsContact *contact)
-+{
-+ GList *events, *itr;
-+
-+ events = gdata_contacts_contact_get_events (contact);
-+ if (!events)
-+ return;
-+
-+ events = g_list_copy (events);
-+ g_list_foreach (events, (GFunc) g_object_ref, NULL);
-+
-+ gdata_contacts_contact_remove_all_events (contact);
-+ for (itr = events; itr; itr = itr->next) {
-+ GDataGContactEvent *event = itr->data;
-+
-+ if (g_strcmp0 (gdata_gcontact_event_get_relation_type (event), GDATA_GCONTACT_EVENT_ANNIVERSARY) != 0)
-+ gdata_contacts_contact_add_event (contact, event);
-+ }
-+
-+ g_list_foreach (events, (GFunc) g_object_unref, NULL);
-+ g_list_free (events);
-+}
-+
-+static void
-+remove_websites (GDataContactsContact *contact)
-+{
-+ GList *websites, *itr;
-+
-+ websites = gdata_contacts_contact_get_websites (contact);
-+ if (!websites)
-+ return;
-+
-+ websites = g_list_copy (websites);
-+ g_list_foreach (websites, (GFunc) g_object_ref, NULL);
-+
-+ gdata_contacts_contact_remove_all_websites (contact);
-+ for (itr = websites; itr; itr = itr->next) {
-+ GDataGContactWebsite *website = itr->data;
-+
-+ if (g_strcmp0 (gdata_gcontact_website_get_relation_type (website), GDATA_GCONTACT_WEBSITE_HOME_PAGE) != 0 &&
-+ g_strcmp0 (gdata_gcontact_website_get_relation_type (website), GDATA_GCONTACT_WEBSITE_BLOG) != 0)
-+ gdata_contacts_contact_add_website (contact, website);
-+ }
-+
-+ g_list_foreach (websites, (GFunc) g_object_unref, NULL);
-+ g_list_free (websites);
-+}
-+#endif
-+
- gboolean
- _gdata_entry_update_from_e_contact (GDataEntry *entry, EContact *contact)
- {
-@@ -69,6 +120,10 @@
- gboolean have_postal_primary = FALSE;
- gboolean have_org_primary = FALSE;
- const gchar *title, *role, *note;
-+ #ifdef HAVE_GDATA_07
-+ EContactDate *bdate;
-+ const gchar *url;
-+ #endif
-
- attributes = e_vcard_get_attributes (E_VCARD (contact));
-
-@@ -214,6 +269,58 @@
- gdata_gd_organization_set_job_description (org, role);
- }
-
-+ #ifdef HAVE_GDATA_07
-+ remove_websites (GDATA_CONTACTS_CONTACT (entry));
-+
-+ url = e_contact_get_const (contact, E_CONTACT_HOMEPAGE_URL);
-+ if (url && *url) {
-+ GDataGContactWebsite *website = gdata_gcontact_website_new (url, GDATA_GCONTACT_WEBSITE_HOME_PAGE, NULL, FALSE);
-+ if (website) {
-+ gdata_contacts_contact_add_website (GDATA_CONTACTS_CONTACT (entry), website);
-+ g_object_unref (website);
-+ }
-+ }
-+
-+ url = e_contact_get_const (contact, E_CONTACT_BLOG_URL);
-+ if (url && *url) {
-+ GDataGContactWebsite *website = gdata_gcontact_website_new (url, GDATA_GCONTACT_WEBSITE_BLOG, NULL, FALSE);
-+ if (website) {
-+ gdata_contacts_contact_add_website (GDATA_CONTACTS_CONTACT (entry), website);
-+ g_object_unref (website);
-+ }
-+ }
-+
-+ gdata_contacts_contact_set_birthday (GDATA_CONTACTS_CONTACT (entry), NULL, TRUE);
-+ bdate = e_contact_get (contact, E_CONTACT_BIRTH_DATE);
-+ if (bdate) {
-+ GDate *gdate = g_date_new_dmy (bdate->day, bdate->month, bdate->year);
-+
-+ if (gdate) {
-+ gdata_contacts_contact_set_birthday (GDATA_CONTACTS_CONTACT (entry), gdate, TRUE);
-+ g_date_free (gdate);
-+ }
-+ e_contact_date_free (bdate);
-+ }
-+
-+ remove_anniversary (GDATA_CONTACTS_CONTACT (entry));
-+ bdate = e_contact_get (contact, E_CONTACT_ANNIVERSARY);
-+ if (bdate) {
-+ GDate *gdate = g_date_new_dmy (bdate->day, bdate->month, bdate->year);
-+
-+ if (gdate) {
-+ GDataGContactEvent *anni = gdata_gcontact_event_new (gdate, GDATA_GCONTACT_EVENT_ANNIVERSARY, NULL);
-+
-+ if (anni) {
-+ gdata_contacts_contact_add_event (GDATA_CONTACTS_CONTACT (entry), anni);
-+ g_object_unref (anni);
-+ }
-+
-+ g_date_free (gdate);
-+ }
-+ e_contact_date_free (bdate);
-+ }
-+ #endif
-+
- return TRUE;
- }
-
-@@ -241,6 +348,11 @@
- GDataGDPostalAddress *postal_address;
- GDataGDOrganization *org;
- GHashTable *extended_props;
-+ #ifdef HAVE_GDATA_07
-+ GList *websites, *events;
-+ GDate bdate;
-+ gboolean bdate_has_year;
-+ #endif
-
- uid = gdata_entry_get_id (entry);
- if (NULL == uid)
-@@ -352,6 +464,84 @@
- extended_props = gdata_contacts_contact_get_extended_properties (GDATA_CONTACTS_CONTACT (entry));
- g_hash_table_foreach (extended_props, (GHFunc) foreach_extended_props_cb, vcard);
-
-+ #ifdef HAVE_GDATA_07
-+ websites = gdata_contacts_contact_get_websites (GDATA_CONTACTS_CONTACT (entry));
-+ for (itr = websites; itr != NULL; itr = itr->next) {
-+ GDataGContactWebsite *website = itr->data;
-+ const gchar *uri, *reltype;
-+
-+ if (!website)
-+ continue;
-+
-+ uri = gdata_gcontact_website_get_uri (website);
-+ reltype = gdata_gcontact_website_get_relation_type (website);
-+
-+ if (!uri || !*uri || !reltype)
-+ continue;
-+
-+ if (g_str_equal (reltype, GDATA_GCONTACT_WEBSITE_HOME_PAGE))
-+ e_contact_set (E_CONTACT (vcard), E_CONTACT_HOMEPAGE_URL, uri);
-+ else if (g_str_equal (reltype, GDATA_GCONTACT_WEBSITE_BLOG))
-+ e_contact_set (E_CONTACT (vcard), E_CONTACT_BLOG_URL, uri);
-+ }
-+
-+ g_date_clear (&bdate, 1);
-+ bdate_has_year = gdata_contacts_contact_get_birthday (GDATA_CONTACTS_CONTACT (entry), &bdate);
-+ if (!bdate_has_year) {
-+ GTimeVal curr_time = { 0 };
-+ GDate tmp_date;
-+
-+ g_get_current_time (&curr_time);
-+ g_date_clear (&tmp_date, 1);
-+ g_date_set_time_val (&tmp_date, &curr_time);
-+
-+ g_date_set_year (&bdate, g_date_get_year (&tmp_date));
-+ }
-+
-+ if (g_date_valid (&bdate)) {
-+ EContactDate *date = e_contact_date_new ();
-+
-+ if (date) {
-+ date->day = g_date_get_day (&bdate);
-+ date->month = g_date_get_month (&bdate);
-+ date->year = g_date_get_year (&bdate);
-+
-+ e_contact_set (E_CONTACT (vcard), E_CONTACT_BIRTH_DATE, date);
-+ e_contact_date_free (date);
-+ }
-+ }
-+
-+ events = gdata_contacts_contact_get_events (GDATA_CONTACTS_CONTACT (entry));
-+ for (itr = events; itr; itr = itr->next) {
-+ GDataGContactEvent *event = itr->data;
-+
-+ if (!event)
-+ continue;
-+
-+ if (!gdata_gcontact_event_get_relation_type (event) ||
-+ !g_str_equal (gdata_gcontact_event_get_relation_type (event), GDATA_GCONTACT_EVENT_ANNIVERSARY))
-+ continue;
-+
-+ g_date_clear (&bdate, 1);
-+ gdata_gcontact_event_get_date (event, &bdate);
-+
-+ if (g_date_valid (&bdate)) {
-+ EContactDate *date = e_contact_date_new ();
-+
-+ if (date) {
-+ date->day = g_date_get_day (&bdate);
-+ date->month = g_date_get_month (&bdate);
-+ date->year = g_date_get_year (&bdate);
-+
-+ e_contact_set (E_CONTACT (vcard), E_CONTACT_ANNIVERSARY, date);
-+ e_contact_date_free (date);
-+ }
-+ }
-+
-+ break;
-+ }
-+ #endif
-+
- return E_CONTACT (vcard);
- }
-
Deleted: trunk/dports/gnome/evolution-data-server/files/patch-m4-evo_krb5_support.m4.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-m4-evo_krb5_support.m4.diff 2013-11-13 08:38:36 UTC (rev 113260)
+++ trunk/dports/gnome/evolution-data-server/files/patch-m4-evo_krb5_support.m4.diff 2013-11-13 08:38:44 UTC (rev 113261)
@@ -1,15 +0,0 @@
---- m4/evo_krb5_support.m4.orig 2010-08-26 10:41:38.000000000 -0700
-+++ m4/evo_krb5_support.m4 2010-08-26 14:02:02.000000000 -0700
-@@ -86,12 +86,6 @@
-
- AM_CONDITIONAL(ENABLE_KRB5, [test "x$with_krb5" != "xno"])
-
-- AC_CHECK_HEADER([et/com_err.h],
-- [AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have <et/com_err.h>])],,
-- [[ #if HAVE_ET_COM_ERR_H
-- #include <com_err.h>
-- #endif
-- ]])
- AC_CHECK_HEADER([com_err.h],
- [AC_DEFINE([HAVE_COM_ERR_H], 1, [Have <com_err.h>])],,
- [[ #if HAVE_COM_ERR_H
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/e2f732ec/attachment-0001.html>
More information about the macports-changes
mailing list