diff options
Diffstat (limited to 'databases/evolution-data-server/files')
4 files changed, 36 insertions, 55 deletions
diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c new file mode 100644 index 000000000000..51f468867330 --- /dev/null +++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c @@ -0,0 +1,13 @@ +--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Sep 9 16:06:37 2005 ++++ addressbook/backends/ldap/e-book-backend-ldap.c Fri Sep 9 16:08:21 2005 +@@ -301,8 +301,8 @@ struct prop_info { + + /* misc fields */ + STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"), +- /* map nickname to displayName */ +- STRING_PROP (E_CONTACT_NICKNAME, "displayName"), ++ /* map nickname to nickname */ ++ STRING_PROP (E_CONTACT_NICKNAME, "nickname"), + E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"), + E_STRING_PROP (E_CONTACT_NOTE, "note"), + E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 7bc7a9cdfb65..fe88433c1287 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,27 +1,29 @@ ---- configure.orig Tue Dec 21 13:46:01 2004 -+++ configure Tue Dec 21 13:50:02 2004 -@@ -7894,10 +7894,10 @@ - Example: --with-nspr-libs=/usr/lib" >&2;} - { (exit 1); exit 1; }; } - else -- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" -+ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else -- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" -+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 -@@ -10011,6 +10011,7 @@ +--- configure.orig Fri Jul 29 17:13:44 2005 ++++ configure Fri Jul 29 17:15:52 2005 +@@ -23461,6 +23461,13 @@ + DL_LIB='' + SOFTOKN3_LIB='' + ;; ++*freebsd*) ++ os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ ;; + *) os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' +@@ -27135,7 +27142,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> +- + #include <stdio.h> - int -@@ -10777,7 +10778,7 @@ + main () +@@ -27873,7 +27880,7 @@ LDFLAGS_save="$LDFLAGS" mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" @@ -30,12 +32,12 @@ echo "$as_me:$LINENO: checking for Kerberos 5" >&5 echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 if test "${ac_cv_lib_kerberos5+set}" = set; then -@@ -29833,7 +29834,7 @@ - idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" +@@ -31176,7 +31183,7 @@ + imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION" -serverdir="$libdir/bonobo/servers" +serverdir="$prefix/libdata/bonobo/servers" - extensiondir='${privlibdir}'/extensions + extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c deleted file mode 100644 index 576ecea6ae3c..000000000000 --- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c +++ /dev/null @@ -1,12 +0,0 @@ ---- servers/groupwise/e-gw-connection.c.orig Tue Mar 8 03:50:29 2005 -+++ servers/groupwise/e-gw-connection.c Tue Mar 8 03:50:40 2005 -@@ -1764,8 +1764,8 @@ - EGwConnectionPrivate *priv; - SoupSoapParameter *param, *subparam, *second_level_child; - char *id, *name; -- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); - static GStaticMutex connecting = G_STATIC_MUTEX_INIT; -+ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); - - priv = cnc->priv; - g_static_mutex_lock (&connecting); diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c deleted file mode 100644 index c865775dae15..000000000000 --- a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c +++ /dev/null @@ -1,22 +0,0 @@ ---- servers/groupwise/e-gw-item.c.orig Tue Jan 25 20:31:45 2005 -+++ servers/groupwise/e-gw-item.c Tue Jan 25 20:32:28 2005 -@@ -2604,8 +2604,8 @@ - - /*attachments*/ - if (priv->attach_list) { -- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - GSList *al ; -+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - for (al = priv->attach_list ; al != NULL ; al = al->next) { - EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; - add_attachment_to_soap_message (attachment, msg) ; -@@ -2669,8 +2669,8 @@ - - /*attachments*/ - if (priv->attach_list) { -- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - GSList *al ; -+ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; - for (al = priv->attach_list ; al != NULL ; al = al->next) { - EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; - add_attachment_to_soap_message (attachment, msg) ; |