summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-04-10 21:54:05 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-04-10 21:54:05 +0000
commitb879ab48b991513f336a39a883db53fae4b694ad (patch)
treef45e2b5a02fc157a9cbdd4320d18c77662af1c47 /gnome-extra/evolution-data-server/files
parentVersion bump. (diff)
downloadhistorical-b879ab48b991513f336a39a883db53fae4b694ad.tar.gz
historical-b879ab48b991513f336a39a883db53fae4b694ad.tar.bz2
historical-b879ab48b991513f336a39a883db53fae4b694ad.zip
Clean up old revision.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/evolution-data-server/files')
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch11
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch39
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch42
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.32.1-no-kerberos.patch125
4 files changed, 0 insertions, 217 deletions
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
deleted file mode 100644
index c420759a8950..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c evolution-data-server-1.7.90.1/camel/camel-disco-diary.c
---- evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c 2006-02-16 04:36:28.000000000 -0500
-+++ evolution-data-server-1.7.90.1/camel/camel-disco-diary.c 2006-08-01 22:55:43.000000000 -0400
-@@ -404,6 +404,7 @@
-
- /* Truncate the log */
- ftruncate (fileno (diary->file), 0);
-+ rewind (diary->file);
- }
-
- CamelDiscoDiary *
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
deleted file mode 100644
index 07eb146e230d..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Mon, 28 Sep 2009 21:34:36 +0200
-Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services
-
----
- camel/providers/imap/camel-imap-store.c | 2 +-
- camel/providers/pop3/camel-pop3-store.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
-index a5eb640..1574e79 100644
---- a/camel/providers/imap/camel-imap-store.c
-+++ b/camel/providers/imap/camel-imap-store.c
-@@ -959,7 +959,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
- port = ssl_options[i].port;
- } else {
- mode = MODE_CLEAR;
-- serv = (gchar *) "imap";
-+ serv = (gchar *) "imap2";
- port = IMAP_PORT;
- }
-
-diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
-index 89be794..a79c06b 100644
---- a/camel/providers/pop3/camel-pop3-store.c
-+++ b/camel/providers/pop3/camel-pop3-store.c
-@@ -311,7 +311,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
- port = ssl_options[i].port;
- } else {
- mode = MODE_CLEAR;
-- serv = (gchar *) "pop3";
-+ serv = (gchar *) "pop-3";
- port = POP3S_PORT;
- }
-
---
-1.6.5.rc1
-
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch
deleted file mode 100644
index 51b3230558d2..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.30.2-revert-addressbook.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a9d0d64ab9aa61855fce0537b90fc05924bc3d85 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Mon, 21 Jun 2010 11:28:22 +0000
-Subject: Revert "Bug 619347 - Return formatted address in e_destination_get_address"
-
-This reverts commit db8c986c4f06f0cb57de9bfa6982b4e78f0bb32a.
-
-Despite the misleading documentation, e_destination_get_address() -is-
-intended to return an encoded address suitable for use in mail headers.
-e_destination_get_textrep() exists for displaying destination addresses
-to the user. The Contact List Editor is apparently calling the wrong
-function.
----
-diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
-index 00b7e76..6ed9870 100644
---- a/addressbook/libebook/e-destination.c
-+++ b/addressbook/libebook/e-destination.c
-@@ -881,11 +881,11 @@ e_destination_get_address (const EDestination *dest)
- iter = g_list_next (iter);
- }
-
-- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
-+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
- } else if (priv->raw) {
-
- if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
-+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
- }
- } else {
- const gchar *name, *email;
-@@ -900,7 +900,7 @@ e_destination_get_address (const EDestination *dest)
- nothing we can do here */
- camel_address_decode (CAMEL_ADDRESS (addr), name);
-
-- priv->addr = camel_address_format (CAMEL_ADDRESS (addr));
-+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
- }
-
- camel_object_unref (CAMEL_OBJECT (addr));
---
-cgit v0.8.3.1
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.1-no-kerberos.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.1-no-kerberos.patch
deleted file mode 100644
index d042a5f74551..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.1-no-kerberos.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- a/camel/camel-sasl-gssapi.c
-+++ b/camel/camel-sasl-gssapi.c
-@@ -20,54 +20,61 @@
- *
- */
-
-+/* If building without Kerberos support, this class is an empty shell. */
-+
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-
- #include <errno.h>
-
--#ifdef HAVE_KRB5
- #include <netdb.h>
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+
-+#include <gio/gio.h>
-+#include <glib/gi18n-lib.h>
-+
-+#include "camel-net-utils.h"
-+#include "camel-sasl-gssapi.h"
-+#include "camel-session.h"
-+
-+#ifdef HAVE_KRB5
-+
- #ifdef HAVE_HEIMDAL_KRB5
- #include <krb5.h>
- #else
- #include <krb5/krb5.h>
--#endif
-+#endif /* HAVE_HEIMDAL_KRB5 */
-+
- #ifdef HAVE_ET_COM_ERR_H
- #include <et/com_err.h>
- #else
- #ifdef HAVE_COM_ERR_H
- #include <com_err.h>
--#endif
--#endif
-+#endif /* HAVE_COM_ERR_H */
-+#endif /* HAVE_ET_COM_ERR_H */
-+
- #ifdef HAVE_MIT_KRB5
- #include <gssapi/gssapi.h>
- #include <gssapi/gssapi_generic.h>
--#endif
-+#endif /* HAVE_MIT_KRB5 */
-+
- #ifdef HAVE_HEIMDAL_KRB5
- #include <gssapi.h>
- #else
--#ifdef HAVE_SUN_KRB5
-+#ifdef HAVE_SUN_KRB5
- #include <gssapi/gssapi.h>
- #include <gssapi/gssapi_ext.h>
- extern gss_OID gss_nt_service_name;
--#endif
--#endif
-+#endif /* HAVE_SUN_KRB5 */
-+#endif /* HAVE_HEIMDAL_KRB5 */
-
- #ifndef GSS_C_OID_KRBV5_DES
- #define GSS_C_OID_KRBV5_DES GSS_C_NO_OID
- #endif
-
--#include <glib/gi18n-lib.h>
--#include <gio/gio.h>
--
--#include "camel-net-utils.h"
--#include "camel-sasl-gssapi.h"
--#include "camel-session.h"
--
- #define DBUS_PATH "/org/gnome/KrbAuthDialog"
- #define DBUS_INTERFACE "org.gnome.KrbAuthDialog"
- #define DBUS_METHOD "org.gnome.KrbAuthDialog.acquireTgt"
-@@ -105,8 +112,12 @@ struct _CamelSaslGssapiPrivate {
- gss_name_t target;
- };
-
-+#endif /* HAVE_KRB5 */
-+
- G_DEFINE_TYPE (CamelSaslGssapi, camel_sasl_gssapi, CAMEL_TYPE_SASL)
-
-+#ifdef HAVE_KRB5
-+
- static void
- gssapi_set_exception (OM_uint32 major,
- OM_uint32 minor,
-@@ -413,9 +424,12 @@ sasl_gssapi_challenge (CamelSasl *sasl,
- return challenge;
- }
-
-+#endif /* HAVE_KRB5 */
-+
- static void
- camel_sasl_gssapi_class_init (CamelSaslGssapiClass *class)
- {
-+#ifdef HAVE_KRB5
- GObjectClass *object_class;
- CamelSaslClass *sasl_class;
-
-@@ -426,16 +440,17 @@ camel_sasl_gssapi_class_init (CamelSaslG
-
- sasl_class = CAMEL_SASL_CLASS (class);
- sasl_class->challenge = sasl_gssapi_challenge;
-+#endif /* HAVE_KRB5 */
- }
-
- static void
- camel_sasl_gssapi_init (CamelSaslGssapi *sasl)
- {
-+#ifdef HAVE_KRB5
- sasl->priv = CAMEL_SASL_GSSAPI_GET_PRIVATE (sasl);
-
- sasl->priv->state = GSSAPI_STATE_INIT;
- sasl->priv->ctx = GSS_C_NO_CONTEXT;
- sasl->priv->target = GSS_C_NO_NAME;
--}
--
- #endif /* HAVE_KRB5 */
-+}