]> git.pld-linux.org Git - packages/evolution.git/commitdiff
- outdated
authorgrzegol <grzegol@pld-linux.org>
Sat, 3 Apr 2004 18:15:27 +0000 (18:15 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    evolution-addrconfig.patch -> 1.2
    evolution-attachment_require_terminal.patch -> 1.4
    evolution-configure_in.patch -> 1.3
    evolution-desktop.patch -> 1.5
    evolution-div_by_zero.patch -> 1.2
    evolution-gethostbyaddr.patch -> 1.2
    evolution-iconv_flush.patch -> 1.2
    evolution-ipv6.patch -> 1.2
    evolution-ipv6_smtp.patch -> 1.2
    evolution-libpcs_libpas.patch -> 1.2
    evolution-no-static-in-shared.patch -> 1.2
    evolution-pldify.patch -> 1.2
    evolution-timezone_offsets.patch -> 1.2

13 files changed:
evolution-addrconfig.patch [deleted file]
evolution-attachment_require_terminal.patch [deleted file]
evolution-configure_in.patch [deleted file]
evolution-desktop.patch [deleted file]
evolution-div_by_zero.patch [deleted file]
evolution-gethostbyaddr.patch [deleted file]
evolution-iconv_flush.patch [deleted file]
evolution-ipv6.patch [deleted file]
evolution-ipv6_smtp.patch [deleted file]
evolution-libpcs_libpas.patch [deleted file]
evolution-no-static-in-shared.patch [deleted file]
evolution-pldify.patch [deleted file]
evolution-timezone_offsets.patch [deleted file]

diff --git a/evolution-addrconfig.patch b/evolution-addrconfig.patch
deleted file mode 100644 (file)
index ad9f307..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-2003-10-16  Jeremy Katz  <katzj@redhat.com>
-
-       * e-host-utils.c (e_gethostbyname_r): use AI_ADDRCONFIG if
-       available to avoid returning IPv6 addresses to hosts without an
-       IPv6 interface.
-
-Index: e-util//e-host-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/e-util/e-host-utils.c,v
-retrieving revision 1.14.4.2
-diff -u -u -r1.14.4.2 e-host-utils.c
---- e-util//e-host-utils.c     8 Oct 2003 20:36:22 -0000       1.14.4.2
-+++ e-util//e-host-utils.c     17 Oct 2003 19:38:08 -0000
-@@ -187,10 +187,21 @@
-       hints.ai_family = PF_UNSPEC;
-       hints.ai_socktype = 0;
-       hints.ai_protocol = 0;
--      
-+
-+#ifdef AI_ADDRCONFIG
-+      hints.ai_flags |= AI_ADDRCONFIG;
-+#endif
-+
-       if ((retval = getaddrinfo (name, NULL, &hints, &res)) != 0) {
--              *herr = ai_to_herr (retval);
--              return -1;
-+#ifdef AI_ADDRCONFIG
-+              hints.ai_flags &= ~AI_ADDRCONFIG;
-+              if ((retval != EAI_BADFLAGS) || (retval = getaddrinfo (name, NULL, &hints, &res)) != 0) {
-+#endif
-+                      *herr = ai_to_herr (retval);
-+                      return -1;
-+#ifdef AI_ADDRCONFIG
-+              }
-+#endif
-       }
-       
-       len = ALIGN (strlen (res->ai_canonname) + 1);
diff --git a/evolution-attachment_require_terminal.patch b/evolution-attachment_require_terminal.patch
deleted file mode 100644 (file)
index 834a1f9..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
---- evolution-1.4.6/mail/mail-display.c~       2003-10-08 18:06:09.000000000 +0200
-+++ evolution-1.4.6/mail/mail-display.c        2004-03-19 11:36:20.991908864 +0100
-@@ -374,6 +374,7 @@
-       GList *apps, *children, *c;
-       GnomeVFSMimeApplication *app;
-       char *command, *filename;
-+      gchar *terminal = NULL;
-       const char *tmpdir;
-       
-       handler = mail_lookup_handler (g_object_get_data(user_data, "mime_type"));
-@@ -422,9 +423,24 @@
-               return;
-       }
-       
--      command = g_strdup_printf ("%s %s%s &", app->command,
-+      if (app->requires_terminal) {
-+              gchar *terminal_exec, *terminal_exec_arg;
-+              GConfClient *gconf = mail_config_get_gconf_client ();
-+              
-+              terminal_exec = gconf_client_get_string (gconf, "/desktop/gnome/applications/terminal/exec", NULL);
-+              terminal_exec_arg = gconf_client_get_string (gconf, "/desktop/gnome/applications/terminal/exec_arg", NULL);
-+              
-+              if (terminal_exec && terminal_exec_arg)
-+                      terminal = g_strdup_printf("%s %s",terminal_exec, terminal_exec_arg);
-+              
-+              g_free(terminal_exec);
-+              g_free(terminal_exec_arg);
-+      }
-+      
-+      command = g_strdup_printf ("%s %s %s%s &", terminal ? terminal : "", app->command,
-                                  app->expects_uris == GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS ?
-                                  "file://" : "", filename);
-+      g_free (terminal);
-       g_free (filename);
-       
-       system (command);
diff --git a/evolution-configure_in.patch b/evolution-configure_in.patch
deleted file mode 100644 (file)
index 758c369..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN aaa/evolution-1.3.0.99/configure.in evolution2-1.3.0.99/configure.in
---- aaa/evolution-1.3.0.99/configure.in        Fri Feb 14 13:01:40 2003
-+++ evolution2-1.3.0.99/configure.in   Sat Feb 15 20:54:20 2003
-@@ -1377,6 +1377,7 @@
- evolution-addressbook.pc
- evolution-calendar.pc
- camel.pc
-+data/evolution.keys
- ])
- if test "x$with_sub_version" != "x"; then
diff --git a/evolution-desktop.patch b/evolution-desktop.patch
deleted file mode 100644 (file)
index f5d9733..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN aaa/evolution-1.4.5/data/evolution.desktop.in.in evolution-1.4.5/data/evolution.desktop.in.in
---- aaa/evolution-1.4.5/data/evolution.desktop.in.in   2003-06-16 16:40:40.000000000 +0200
-+++ evolution-1.4.5/data/evolution.desktop.in.in       2003-12-21 18:05:13.000000000 +0100
-@@ -10,3 +10,5 @@
- X-GNOME-Bugzilla-Bugzilla=Ximian
- X-GNOME-Bugzilla-Product=evolution
- X-GNOME-Bugzilla-OtherBinaries=evolution-wombat;evolution-exchange-storage;
-+Encoding=UTF-8
-+# vi: encoding=utf-8
diff --git a/evolution-div_by_zero.patch b/evolution-div_by_zero.patch
deleted file mode 100644 (file)
index 1dbe994..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-2003-09-22  Not Zed  <NotZed@Ximian.com>
-
-       ** See bug #41610
-
-       * providers/pop3/camel-pop3-folder.c (cmd_tocache): protect a
-       divide by 0 for 0 length messages.
-
-Index: camel/providers/pop3/camel-pop3-folder.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/providers/pop3/camel-pop3-folder.c,v
-retrieving revision 1.59
-diff -u -3 -r1.59 camel-pop3-folder.c
---- camel/providers/pop3/camel-pop3-folder.c   18 Jun 2003 17:55:40 -0000      1.59
-+++ camel/providers/pop3/camel-pop3-folder.c   22 Sep 2003 22:55:00 -0000
-@@ -365,7 +365,8 @@
-               w += n;
-               if (w > fi->size)
-                       w = fi->size;
--              camel_operation_progress(NULL, (w * 100) / fi->size);
-+              if (fi->size != 0)
-+                      camel_operation_progress(NULL, (w * 100) / fi->size);
-       }
-       /* it all worked, output a '#' to say we're a-ok */
diff --git a/evolution-gethostbyaddr.patch b/evolution-gethostbyaddr.patch
deleted file mode 100644 (file)
index 148759a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-2003-09-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-       * e-host-utils.c (e_gethostbyaddr_r): Work around a bug in glibc
-       2.3.2's gethostbyaddr_r() implementation.
-
-Index: evolution/e-util/e-host-utils.c
-diff -u evolution/e-util/e-host-utils.c:1.14.4.1 evolution/e-util/e-host-utils.c:1.14.4.2
---- evolution/e-util/e-host-utils.c:1.14.4.1   Mon Sep 29 11:39:44 2003
-+++ evolution/e-util/e-host-utils.c    Wed Oct  8 16:36:22 2003
-@@ -337,8 +337,21 @@
-       int retval;
-       
-       retval = gethostbyaddr_r (addr, addrlen, type, host, buf, buflen, &hp, herr);
--      if (hp != NULL)
-+      
-+      if (hp != NULL) {
-               *herr = 0;
-+              retval = 0;
-+      } else if (retval == 0) {
-+              /* glibc 2.3.2 workaround - it seems that
-+               * gethostbyaddr_r will sometimes return 0 on fail and
-+               * fill @host with garbage strings from /etc/hosts
-+               * (failure to parse the file? who knows). Luckily, it
-+               * seems that we can rely on @hp being NULL on
-+               * fail.
-+               */
-+              retval = -1;
-+      }
-+      
-       return retval;
- #endif
- #else /* No support for gethostbyaddr_r */
diff --git a/evolution-iconv_flush.patch b/evolution-iconv_flush.patch
deleted file mode 100644 (file)
index 4c99b74..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-2003-09-23  Jeffrey Stedfast  <fejj@ximian.com>
-
-       * camel-mime-utils.c (append_8bit): Don't forget to flush the
-       iconv conversion.
-
-Index: camel-mime-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
-retrieving revision 1.183.4.3
-diff -u -r1.183.4.3 camel-mime-utils.c
---- camel/camel-mime-utils.c   29 Jul 2003 13:53:29 -0000      1.183.4.3
-+++ camel/camel-mime-utils.c   23 Sep 2003 18:37:57 -0000
-@@ -1132,7 +1132,9 @@
-               e_iconv_close (ic);
-               return FALSE;
-       }
--
-+      
-+      e_iconv (ic, NULL, NULL, &outbuf, &outlen);
-+      
-       *outbuf = 0;
-       g_string_append(out, outbase);
-       g_free(outbase);
diff --git a/evolution-ipv6.patch b/evolution-ipv6.patch
deleted file mode 100644 (file)
index 6cf8ab5..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-2003-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-       * e-host-utils.c (e_gethostbyaddr_r): IPv6 implementation
-       rewritten to use getnameinfo() which is the proper function to use
-       in this case. Fixes bug #46006.
-
-Index: e-host-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/e-util/e-host-utils.c,v
-retrieving revision 1.14
-diff -u -r1.14 e-host-utils.c
---- e-util/e-host-utils.c      29 Apr 2003 02:14:37 -0000      1.14
-+++ e-util/e-host-utils.c      26 Sep 2003 15:51:10 -0000
-@@ -291,34 +291,18 @@
-                  char *buf, size_t buflen, int *herr)
- {
- #ifdef ENABLE_IPv6
--      struct addrinfo hints, *res;
--      const char *name;
-       int retval, len;
-       
--      if ((name = inet_ntop (type, addr, buf, buflen)) == NULL) {
--              if (errno == ENOSPC)
--                      return ERANGE;
--              
--              return -1;
--      }
--      
--      memset (&hints, 0, sizeof (struct addrinfo));
--      hints.ai_flags = AI_CANONNAME;
--      hints.ai_family = type == AF_INET6 ? PF_INET6 : PF_INET;
--      hints.ai_socktype = 0;
--      hints.ai_protocol = 0;
--      
--      if ((retval = getaddrinfo (name, NULL, &hints, &res)) != 0) {
-+      if ((retval = getnameinfo (addr, addrlen, buf, buflen, NULL, 0, NI_NAMEREQD)) != 0) {
-               *herr = ai_to_herr (retval);
-               return -1;
-       }
-       
--      len = ALIGN (strlen (res->ai_canonname) + 1);
--      if (buflen < IPv6_BUFLEN_MIN + len + res->ai_addrlen + sizeof (char *))
-+      len = ALIGN (strlen (buf) + 1);
-+      if (buflen < IPv6_BUFLEN_MIN + len + addrlen + sizeof (char *))
-               return ERANGE;
-       
-       /* h_name */
--      strcpy (buf, res->ai_canonname);
-       host->h_name = buf;
-       buf += len;
-       
-@@ -328,16 +312,8 @@
-       buf += sizeof (char *);
-       
-       /* h_addrtype and h_length */
--      host->h_length = res->ai_addrlen;
--      if (res->ai_family == PF_INET6) {
--              host->h_addrtype = AF_INET6;
--              
--              addr = (char *) &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr;
--      } else {
--              host->h_addrtype = AF_INET;
--              
--              addr = (char *) &((struct sockaddr_in *) res->ai_addr)->sin_addr;
--      }
-+      host->h_length = addrlen;
-+      host->h_addrtype = type;
-       
-       memcpy (buf, addr, host->h_length);
-       addr = buf;
-@@ -347,8 +323,6 @@
-       ((char **) buf)[0] = addr;
-       ((char **) buf)[1] = NULL;
-       host->h_addr_list = (char **) buf;
--      
--      freeaddrinfo (res);
-       
-       return 0;
- #else /* No support for IPv6 addresses */
diff --git a/evolution-ipv6_smtp.patch b/evolution-ipv6_smtp.patch
deleted file mode 100644 (file)
index b4f1386..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-2003-09-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-       * providers/smtp/camel-smtp-transport.c (smtp_helo): If the
-       localhost lookup results in a numeric IPv6 host, use the form
-       "[IPv6:<addr>]" as specified in rfc2821. Fixes bug #46006.
-
-Index: providers/smtp/camel-smtp-transport.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/providers/smtp/camel-smtp-transport.c,v
-retrieving revision 1.138
-diff -u -r1.138 camel-smtp-transport.c
---- camel/providers/smtp/camel-smtp-transport.c        16 May 2003 18:47:59 -0000      1.138
-+++ camel/providers/smtp/camel-smtp-transport.c        25 Sep 2003 14:44:07 -0000
-@@ -896,8 +896,10 @@
-       } else {
- #ifdef ENABLE_IPv6
-               char ip[MAXHOSTNAMELEN + 1];
-+              const char *proto;
-               
--              name = g_strdup_printf ("[%s]", inet_ntop (af, transport->localaddr->address, ip, MAXHOSTNAMELEN));
-+              proto = transport->localaddr->family == CAMEL_TCP_ADDRESS_IPv6 ? "IPv6:" : "";
-+              name = g_strdup_printf ("[%s%s]", proto, inet_ntop (af, transport->localaddr->address, ip, MAXHOSTNAMELEN));
- #else
-               /* We *could* use inet_ntoa() here, but it's probably
-                  not worth it since we would have to worry about
diff --git a/evolution-libpcs_libpas.patch b/evolution-libpcs_libpas.patch
deleted file mode 100644 (file)
index 597de3b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN aaa/evolution-1.4.5/evolution-addressbook.pc.in evolution-1.4.5/evolution-addressbook.pc.in
---- aaa/evolution-1.4.5/evolution-addressbook.pc.in    2003-05-22 22:18:00.000000000 +0200
-+++ evolution-1.4.5/evolution-addressbook.pc.in        2003-11-20 14:50:13.000000000 +0100
-@@ -13,5 +13,5 @@
- Description: libraries needed for Evolution addressbook backends
- Version: @VERSION@
- Requires: gconf-2.0 libbonobo-2.0 gal-2.0 >= @GAL_REQUIRED@ libgnome-2.0 camel = @VERSION@
--Libs: -L${privlibdir} -lpas -lebook -lename -lversit
-+Libs: -L${privlibdir} -lebook -lename -lversit
- Cflags: -I${privincludedir}
-diff -urN aaa/evolution-1.4.5/evolution-calendar.pc.in evolution-1.4.5/evolution-calendar.pc.in
---- aaa/evolution-1.4.5/evolution-calendar.pc.in       2003-05-22 22:18:00.000000000 +0200
-+++ evolution-1.4.5/evolution-calendar.pc.in   2003-11-20 14:50:20.000000000 +0100
-@@ -13,5 +13,5 @@
- Description: libraries needed for Evolution calendar backends
- Version: @VERSION@
- Requires: libgnome-2.0 libbonobo-2.0 gal-2.0 >= @GAL_REQUIRED@ gnome-vfs-2.0
--Libs: -L${privlibdir} -lpcs -lcal-util -lcal-client -lical-evolution -lwombat -leutil
-+Libs: -L${privlibdir} -lcal-util -lcal-client -lical-evolution -lwombat -leutil
- Cflags: -I${privincludedir}
diff --git a/evolution-no-static-in-shared.patch b/evolution-no-static-in-shared.patch
deleted file mode 100644 (file)
index 0a2a3fa..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
---- evolution-1.4.5/camel/Makefile.am.orig     2003-06-12 17:03:35.000000000 +0000
-+++ evolution-1.4.5/camel/Makefile.am  2003-11-23 13:18:40.000000000 +0000
-@@ -8,7 +8,6 @@
- camellibexec_PROGRAMS =       camel-lock-helper camel-index-control
- privlib_LTLIBRARIES = libcamel.la
--noinst_LTLIBRARIES = libcamel-static.la
- INCLUDES = -I.. -I$(srcdir)/..                                \
-       -I$(top_srcdir)/intl                            \
-@@ -229,10 +228,6 @@
-       $(top_builddir)/e-util/libeutil.la      \
-       $(CAMEL_LIBS)
--libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)
--libcamel_static_la_LIBADD  = $(libcamel_la_LIBADD)
--libcamel_static_la_LDFLAGS = --all-static
--
- camel_lock_helper_SOURCES =                   \
-       camel-lock-helper.c                     \
-       camel-lock-helper.h
---- evolution-1.4.5/libwombat/Makefile.am.orig 2003-06-23 14:00:22.000000000 +0000
-+++ evolution-1.4.5/libwombat/Makefile.am      2003-11-23 13:20:45.000000000 +0000
-@@ -27,13 +27,6 @@
-       wombat-client.c \
-       $(wombatinclude_HEADERS)
--# Static lib for pilot conduits
--
--noinst_LTLIBRARIES = libwombat-static.la
--
--libwombat_static_la_SOURCES = $(libwombat_la_SOURCES)
--libwombat_static_la_LDFLAGS = --all-static
--
- BUILT_SOURCES = $(IDL_GENERATED)
- CLEANFILES = $(BUILT_SOURCES)
---- evolution-1.4.5/libical/src/libical/Makefile.am.orig       2003-02-10 15:53:20.000000000 +0000
-+++ evolution-1.4.5/libical/src/libical/Makefile.am    2003-11-23 13:21:43.000000000 +0000
-@@ -28,14 +28,6 @@
- privlib_LTLIBRARIES = libical-evolution.la
--noinst_LTLIBRARIES = libical-static.la
--libical_static_la_SOURCES = $(libical_evolution_la_SOURCES)
--libical_static_la_LDFLAGS = --all-static
--
--# Make sure libical-evolution.la and libical-static.la are not built in
--# parallel when using a parallel make; libtool can't handle that.
--libical_static_la_DEPENDENCIES = libical-evolution.la
--
- YFLAGS = -d -v -t -pical_yy
- LFLAGS = -Pical_yy
- LEX_OUTPUT_ROOT = lex.ical_yy
---- evolution-1.4.5/e-util/ename/Makefile.am.orig      2003-02-06 21:59:58.000000000 +0000
-+++ evolution-1.4.5/e-util/ename/Makefile.am   2003-11-23 13:23:09.000000000 +0000
-@@ -26,11 +26,6 @@
-       e-name-western.h
--noinst_LTLIBRARIES = libename-static.la
--libename_static_la_SOURCES = $(libename_la_SOURCES)
--libename_static_la_LDFLAGS = --all-static
--
--
- noinst_PROGRAMS =             \
-       test-ename-western      \
-       test-ename-western-gtk
---- evolution-1.4.5/e-util/Makefile.am.orig    2003-09-11 16:19:50.000000000 +0000
-+++ evolution-1.4.5/e-util/Makefile.am 2003-11-23 13:23:41.000000000 +0000
-@@ -16,7 +16,6 @@
-       $(E_UTIL_CFLAGS)
- privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la
--noinst_LTLIBRARIES = libeutil-static.la
- eutilinclude_HEADERS =                                \
-       e-account-list.h                        \
-@@ -107,13 +106,6 @@
- libeutil_la_LIBADD = $(E_UTIL_LIBS)
--libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
--libeutil_static_la_LIBADD  = $(libeutil_la_LIBADD)
--libeutil_static_la_LDFLAGS = -all-static
--# Make sure libeutil.la and libeutil-static.la are not built in
--# parallel when using a parallel make; libtool can't handle that.
--libeutil_static_la_DEPENDENCIES = libeutil.la
--
- econdinclude_HEADERS =                \
-       e-pilot-map.h           \
-       e-pilot-settings.h      \
---- evolution-1.4.5/calendar/cal-util/Makefile.am.orig 2003-02-24 14:33:38.000000000 +0000
-+++ evolution-1.4.5/calendar/cal-util/Makefile.am      2003-11-23 13:24:15.000000000 +0000
-@@ -15,7 +15,7 @@
- # cal util library
- #
--privlib_LTLIBRARIES = libcal-util-static.la libcal-util.la
-+privlib_LTLIBRARIES = libcal-util.la
- libcal_util_la_SOURCES =      \
-       cal-util-marshal.c      \
-@@ -52,13 +52,6 @@
- BUILT_SOURCES = $(MARSHAL_GENERATED)
--#
--# static library for use in conduits' shared libraries
--#
--#lib_LTLIBRARIES = libcal-util-static.la
--libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
--libcal_util_static_la_LDFLAGS = -all-static
--
- test_recur_SOURCES =  \
-        test-recur.c
-@@ -67,4 +60,4 @@
-        $(EVOLUTION_CALENDAR_LIBS)
- EXTRA_DIST = \
--      cal-util-marshal.list
-\ No newline at end of file
-+      cal-util-marshal.list
---- evolution-1.4.5/calendar/conduits/todo/Makefile.am.orig    2003-09-11 16:19:06.000000000 +0000
-+++ evolution-1.4.5/calendar/conduits/todo/Makefile.am 2003-11-23 13:27:00.000000000 +0000
-@@ -18,11 +18,11 @@
- libetodo_conduit_la_LDFLAGS = -module -avoid-version
- libetodo_conduit_la_LIBADD =                                          \
-       $(top_builddir)/e-util/libeutil.la                              \
--      $(top_builddir)/calendar/cal-client/libcal-client-static.la     \
--      $(top_builddir)/calendar/cal-util/libcal-util-static.la         \
-+      $(top_builddir)/calendar/cal-client/libcal-client.la            \
-+      $(top_builddir)/calendar/cal-util/libcal-util.la                \
-       $(top_builddir)/libversit/libversit.la                          \
--      $(top_builddir)/libical/src/libical/libical-static.la           \
--      $(top_builddir)/libwombat/libwombat-static.la                   \
-+      $(top_builddir)/libical/src/libical/libical-evolution.la        \
-+      $(top_builddir)/libwombat/libwombat.la                          \
-       $(top_builddir)/e-util/libeconduit.la                           \
-       $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
---- evolution-1.4.5/calendar/conduits/calendar/Makefile.am.orig        2003-06-23 13:59:48.000000000 +0000
-+++ evolution-1.4.5/calendar/conduits/calendar/Makefile.am     2003-11-23 13:28:24.000000000 +0000
-@@ -18,11 +18,11 @@
- libecalendar_conduit_la_LDFLAGS = -module -avoid-version
- libecalendar_conduit_la_LIBADD =                                      \
-       $(top_builddir)/e-util/libeutil.la                              \
--      $(top_builddir)/calendar/cal-client/libcal-client-static.la     \
--      $(top_builddir)/calendar/cal-util/libcal-util-static.la         \
-+      $(top_builddir)/calendar/cal-client/libcal-client.la            \
-+      $(top_builddir)/calendar/cal-util/libcal-util.la                \
-       $(top_builddir)/libversit/libversit.la                          \
--      $(top_builddir)/libical/src/libical/libical-static.la           \
--      $(top_builddir)/libwombat/libwombat-static.la                   \
-+      $(top_builddir)/libical/src/libical/libical-evolution.la        \
-+      $(top_builddir)/libwombat/libwombat.la                          \
-       $(top_builddir)/e-util/libeconduit.la                           \
-       $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
---- evolution-1.4.5/calendar/cal-client/Makefile.am.orig       2003-02-24 14:33:38.000000000 +0000
-+++ evolution-1.4.5/calendar/cal-client/Makefile.am    2003-11-23 13:24:59.000000000 +0000
-@@ -62,14 +62,6 @@
-       cal-query.h
- #
--# make a static library for use by calendar conduit's shared library
--#
--noinst_LTLIBRARIES = libcal-client-static.la
--libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
--libcal_client_static_la_LDFLAGS = --all-static
--
--
--#
- # client-test program
- #
---- evolution-1.4.5/addressbook/conduit/Makefile.am.orig       2003-09-11 16:18:55.000000000 +0000
-+++ evolution-1.4.5/addressbook/conduit/Makefile.am    2003-11-23 13:29:00.000000000 +0000
-@@ -18,8 +18,8 @@
- libeaddress_conduit_la_LDFLAGS = -module -avoid-version
- libeaddress_conduit_la_LIBADD =                                       \
-       $(top_builddir)/e-util/libeutil.la                              \
--      $(top_builddir)/addressbook/backend/ebook/libebook-static.la    \
--      $(top_builddir)/e-util/ename/libename-static.la                 \
-+      $(top_builddir)/addressbook/backend/ebook/libebook.la           \
-+      $(top_builddir)/e-util/ename/libename.la                        \
-       $(top_builddir)/libversit/libversit.la                          \
-       $(top_builddir)/e-util/libeconduit.la                           \
-       $(top_builddir)/camel/libcamel.la                               \
---- evolution-1.4.5/addressbook/backend/ebook/Makefile.am.orig 2003-06-12 17:02:46.000000000 +0000
-+++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am      2003-11-23 13:25:34.000000000 +0000
-@@ -49,11 +49,7 @@
-       -DLIBGNOME_DISABLE_DEPRECATED                   \
-         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
--privlib_LTLIBRARIES = libebook.la libebook-static.la
--
--# Make sure the libraries are not built in parallel when using a parallel make;
--# libtool can't handle that.
--libebook_static_la_DEPENDENCIES = libebook.la
-+privlib_LTLIBRARIES = libebook.la
- libebook_la_SOURCES =                                 \
-       $(CORBA_SOURCE)                                 \
-@@ -93,12 +89,6 @@
-       addressbook.h
--#
--# make a static library for use by addressbook's conduit's shared library
--#
--libebook_static_la_SOURCES = $(libebook_la_SOURCES)
--libebook_static_la_LDFLAGS = -all-static
--
- # GLib marshalling cruft
- e-book-marshal.h: e-book-marshal.list
diff --git a/evolution-pldify.patch b/evolution-pldify.patch
deleted file mode 100644 (file)
index 437f853..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
---- evolution-1.3.2/addressbook/backend/pas/pas-backend-file.c.pld     2003-04-30 02:12:25.000000000 -0400
-+++ evolution-1.3.2/addressbook/backend/pas/pas-backend-file.c 2003-04-30 02:13:08.000000000 -0400
-@@ -1354,14 +1354,10 @@
- }
- #define INITIAL_VCARD "BEGIN:VCARD\n\
--X-EVOLUTION-FILE-AS:Ximian, Inc.\n\
--LABEL;WORK;QUOTED-PRINTABLE:401 Park Drive  3 West=0ABoston, MA 02215=0AUSA\n\
--TEL;WORK;VOICE:(617) 375-3800\n\
--TEL;WORK;FAX:(617) 236-8630\n\
--EMAIL;INTERNET:hello@ximian.com\n\
--URL:www.ximian.com/\n\
--ORG:Ximian, Inc.;\n\
--NOTE:Welcome to the Ximian Addressbook.\n\
-+X-EVOLUTION-FILE-AS:PLD Linux Distribution\n\
-+EMAIL;INTERNET:feedback@pld-linux.org\n\
-+URL:www.pld-linux.org/\n\
-+ORG:PLD Linux Distribution;\n\
- END:VCARD"
- static GNOME_Evolution_Addressbook_BookListener_CallStatus
diff --git a/evolution-timezone_offsets.patch b/evolution-timezone_offsets.patch
deleted file mode 100644 (file)
index e0dc328..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-2003-10-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-       * camel-mime-utils.c (header_decode_date): Allow timezone offsets
-       to be up to 14 hours ahead of UTC. Fixes bug #49357.
-
-Index: camel-mime-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution/camel/camel-mime-utils.c,v
-retrieving revision 1.183.4.4
-diff -u -r1.183.4.4 camel-mime-utils.c
---- camel/camel-mime-utils.c   26 Sep 2003 16:04:49 -0000      1.183.4.4
-+++ camel/camel-mime-utils.c   8 Oct 2003 16:42:55 -0000
-@@ -3530,12 +3530,12 @@
-               offset = (*inptr++)=='-'?-1:1;
-               offset = offset * header_decode_int(&inptr);
-               d(printf("abs signed offset = %d\n", offset));
--              if (offset < -1200 || offset > 1200)
-+              if (offset < -1200 || offset > 1400)
-                       offset = 0;
-       } else if (isdigit(*inptr)) {
-               offset = header_decode_int(&inptr);
-               d(printf("abs offset = %d\n", offset));
--              if (offset < -1200 || offset > 1200)
-+              if (offset < -1200 || offset > 1400)
-                       offset = 0;
-       } else {
-               char *tz = decode_token(&inptr);
This page took 0.06048 seconds and 4 git commands to generate.