]> git.pld-linux.org Git - packages/evolution-data-server.git/commitdiff
projects / packages / evolution-data-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94fa296)
- merged from DEVEL
authorpaladine <paladine@pld-linux.org>
Wed, 9 Mar 2005 22:26:01 +0000 (22:26 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    evolution-data-server-GG-IM.patch -> 1.2
    evolution-data-server-system_db.patch -> 1.7

evolution-data-server-GG-IM.patch patch | blob | blame | history
evolution-data-server-system_db.patch patch | blob | blame | history

diff --git a/evolution-data-server-GG-IM.patch b/evolution-data-server-GG-IM.patch
index bfa0218731f93028b594e2fb1268e4a1fbd19b11..507e34aeaff4a7686696daa42afeb67888a4444d 100644 (file)
--- a/evolution-data-server-GG-IM.patch
+++ b/evolution-data-server-GG-IM.patch
@@ -1,7 +1,7 @@
-diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c
---- evolution-data-server.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c       2004-06-02 12:31:44.303464592 +0200
-+++ evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c    2004-06-02 12:49:41.386723048 +0200
-@@ -123,6 +123,7 @@
+diff -urN aa/evolution-data-server-1.1.5/addressbook/backends/groupwise/e-book-backend-groupwise.c evolution-data-server-1.1.5/addressbook/backends/groupwise/e-book-backend-groupwise.c
+--- aa/evolution-data-server-1.1.5/addressbook/backends/groupwise/e-book-backend-groupwise.c   2005-02-04 07:30:34.000000000 +0100
++++ evolution-data-server-1.1.5/addressbook/backends/groupwise/e-book-backend-groupwise.c      2005-02-12 22:40:38.005140712 +0100
+@@ -143,6 +143,7 @@
        GList *aim_list = NULL;
        GList *icq_list = NULL;
        GList *yahoo_list = NULL;
@@ -9,7 +9,7 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
        GList *msn_list = NULL;
        GList *jabber_list = NULL;
        GList *groupwise_list = NULL;
-@@ -158,6 +159,10 @@
+@@ -178,6 +179,10 @@
                        im_field_id = E_CONTACT_IM_YAHOO;
                        im_attr_list = &yahoo_list;
                }
@@ -20,7 +20,7 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
                else if (g_str_equal (address->service, "jabber")) {
                        im_field_id = E_CONTACT_IM_JABBER;
                        im_attr_list = &jabber_list;
-@@ -180,6 +185,7 @@
+@@ -200,6 +205,7 @@
        e_contact_set_attributes (contact, E_CONTACT_IM_JABBER, jabber_list);
        e_contact_set_attributes (contact, E_CONTACT_IM_ICQ, icq_list);
        e_contact_set_attributes (contact, E_CONTACT_IM_YAHOO, yahoo_list);
@@ -28,7 +28,7 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
        e_contact_set_attributes (contact, E_CONTACT_IM_MSN, msn_list);
        e_contact_set_attributes (contact, E_CONTACT_IM_GROUPWISE, groupwise_list);
        
-@@ -187,6 +193,7 @@
+@@ -207,6 +213,7 @@
        free_attr_list (jabber_list);
        free_attr_list (icq_list);
        free_attr_list (yahoo_list);
@@ -36,7 +36,7 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
        free_attr_list (msn_list);
        free_attr_list (groupwise_list);
  }
-@@ -219,6 +226,7 @@
+@@ -239,6 +246,7 @@
    
        append_ims_to_list (&im_list, contact, "aim", E_CONTACT_IM_AIM);
        append_ims_to_list (&im_list, contact, "yahoo", E_CONTACT_IM_YAHOO);
@@ -44,7 +44,7 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
        append_ims_to_list (&im_list, contact, "icq", E_CONTACT_IM_ICQ);
        append_ims_to_list (&im_list, contact, "msn", E_CONTACT_IM_MSN);
        append_ims_to_list (&im_list, contact, "jabber", E_CONTACT_IM_JABBER);
-@@ -1968,6 +1976,7 @@
+@@ -2371,6 +2379,7 @@
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_EMAIL_3)));
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_ICQ)));
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_YAHOO)));
@@ -52,10 +52,10 @@ diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backe
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_MSN)));
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_JABBER)));
        fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_GROUPWISE)));
-diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.c evolution-data-server/addressbook/libebook/e-contact.c
---- evolution-data-server.orig/addressbook/libebook/e-contact.c        2004-06-02 12:31:44.883376432 +0200
-+++ evolution-data-server/addressbook/libebook/e-contact.c     2004-06-02 12:41:36.416449736 +0200
-@@ -155,6 +155,7 @@
+diff -urN aa/evolution-data-server-1.1.5/addressbook/libebook/e-contact.c evolution-data-server-1.1.5/addressbook/libebook/e-contact.c
+--- aa/evolution-data-server-1.1.5/addressbook/libebook/e-contact.c    2005-02-06 13:28:41.000000000 +0100
++++ evolution-data-server-1.1.5/addressbook/libebook/e-contact.c       2005-02-12 22:40:38.007140408 +0100
+@@ -157,6 +157,7 @@
          MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"),       FALSE),
        MULTI_LIST_FIELD (E_CONTACT_IM_JABBER,    EVC_X_JABBER,    "im_jabber",    N_("Jabber Id List"),          FALSE),
        MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,     EVC_X_YAHOO,     "im_yahoo",     N_("Yahoo! Screen Name List"), FALSE),
@@ -63,7 +63,7 @@ diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.c evolution-
        MULTI_LIST_FIELD (E_CONTACT_IM_MSN,       EVC_X_MSN,       "im_msn",       N_("MSN Screen Name List"),    FALSE),
        MULTI_LIST_FIELD (E_CONTACT_IM_ICQ,       EVC_X_ICQ,       "im_icq",       N_("ICQ Id List"),             FALSE),
   
-@@ -182,6 +183,12 @@
+@@ -184,6 +185,12 @@
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_1,  EVC_X_YAHOO,  "im_yahoo_work_1",  N_("Yahoo! Work Screen Name 1"), FALSE, "WORK", 0),
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_2,  EVC_X_YAHOO,  "im_yahoo_work_2",  N_("Yahoo! Work Screen Name 2"), FALSE, "WORK", 1),
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_3,  EVC_X_YAHOO,  "im_yahoo_work_3",  N_("Yahoo! Work Screen Name 3"), FALSE, "WORK", 2),
@@ -76,9 +76,9 @@ diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.c evolution-
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_1,    EVC_X_MSN,    "im_msn_home_1",    N_("MSN Home Screen Name 1"),    FALSE, "HOME", 0),
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_2,    EVC_X_MSN,    "im_msn_home_2",    N_("MSN Home Screen Name 2"),    FALSE, "HOME", 1),
        ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_3,    EVC_X_MSN,    "im_msn_home_3",    N_("MSN Home Screen Name 3"),    FALSE, "HOME", 2),
-diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.h evolution-data-server/addressbook/libebook/e-contact.h
---- evolution-data-server.orig/addressbook/libebook/e-contact.h        2004-06-02 12:31:44.883376432 +0200
-+++ evolution-data-server/addressbook/libebook/e-contact.h     2004-06-02 12:44:07.738445296 +0200
+diff -urN aa/evolution-data-server-1.1.5/addressbook/libebook/e-contact.h evolution-data-server-1.1.5/addressbook/libebook/e-contact.h
+--- aa/evolution-data-server-1.1.5/addressbook/libebook/e-contact.h    2005-02-06 19:09:01.000000000 +0100
++++ evolution-data-server-1.1.5/addressbook/libebook/e-contact.h       2005-02-12 22:40:38.008140256 +0100
 @@ -128,6 +128,12 @@
        E_CONTACT_IM_YAHOO_WORK_1,     /* Synthetic string field */
        E_CONTACT_IM_YAHOO_WORK_2,     /* Synthetic string field */
@@ -92,7 +92,7 @@ diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.h evolution-
        E_CONTACT_IM_MSN_HOME_1,       /* Synthetic string field */
        E_CONTACT_IM_MSN_HOME_2,       /* Synthetic string field */
        E_CONTACT_IM_MSN_HOME_3,       /* Synthetic string field */
-@@ -166,6 +172,7 @@
+@@ -167,6 +173,7 @@
        E_CONTACT_IM_GROUPWISE,  /* Multi-valued */
        E_CONTACT_IM_JABBER,     /* Multi-valued */
        E_CONTACT_IM_YAHOO,      /* Multi-valued */
@@ -100,21 +100,21 @@ diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.h evolution-
        E_CONTACT_IM_MSN,        /* Multi-valued */
        E_CONTACT_IM_ICQ,        /* Multi-valued */
         
-diff -urN evolution-data-server.orig/addressbook/libebook/e-vcard.h evolution-data-server/addressbook/libebook/e-vcard.h
---- evolution-data-server.orig/addressbook/libebook/e-vcard.h  2004-06-02 12:31:45.544275960 +0200
-+++ evolution-data-server/addressbook/libebook/e-vcard.h       2004-06-02 12:45:00.322451312 +0200
+diff -urN aa/evolution-data-server-1.1.5/addressbook/libebook/e-vcard.h evolution-data-server-1.1.5/addressbook/libebook/e-vcard.h
+--- aa/evolution-data-server-1.1.5/addressbook/libebook/e-vcard.h      2004-05-03 18:43:00.000000000 +0200
++++ evolution-data-server-1.1.5/addressbook/libebook/e-vcard.h 2005-02-12 22:48:04.288295360 +0100
 @@ -85,6 +85,7 @@
  #define EVC_X_VIDEO_URL       "X-EVOLUTION-VIDEO-URL"
  #define EVC_X_WANTS_HTML      "X-MOZILLA-HTML"
  #define EVC_X_YAHOO           "X-YAHOO"
-+#define EVC_X_GADUGADU         "X-GADUGADU"
++#define EVC_X_GADUGADU        "X-GADUGADU"
  #define EVC_X_GROUPWISE       "X-GROUPWISE"
  
  typedef enum {
-diff -urN evolution-data-server.orig/addressbook/libedata-book/e-book-backend-sexp.c evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c
---- evolution-data-server.orig/addressbook/libedata-book/e-book-backend-sexp.c 2004-06-02 12:31:45.546275656 +0200
-+++ evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c      2004-06-02 12:34:22.944347512 +0200
-@@ -89,6 +89,13 @@
+diff -urN aa/evolution-data-server-1.1.5/addressbook/libedata-book/e-book-backend-sexp.c evolution-data-server-1.1.5/addressbook/libedata-book/e-book-backend-sexp.c
+--- aa/evolution-data-server-1.1.5/addressbook/libedata-book/e-book-backend-sexp.c     2005-01-28 15:42:19.000000000 +0100
++++ evolution-data-server-1.1.5/addressbook/libedata-book/e-book-backend-sexp.c        2005-02-12 22:49:22.176454560 +0100
+@@ -87,6 +87,13 @@
  }
  
  static gboolean
@@ -128,11 +128,11 @@ diff -urN evolution-data-server.orig/addressbook/libedata-book/e-book-backend-se
  compare_im_jabber (EContact *contact, const char *str,
                   char *(*compare)(const char*, const char*))
  {
-@@ -221,6 +228,7 @@
+@@ -252,6 +259,7 @@
        LIST_PROP ( "im_icq",    compare_im_icq ),
        LIST_PROP ( "im_jabber", compare_im_jabber ),
        LIST_PROP ( "im_yahoo",  compare_im_yahoo ),
 +      LIST_PROP ( "im_gadugadu",  compare_im_gadugadu ),
+       LIST_PROP ( "im_groupwise", compare_im_groupwise ),
        LIST_PROP ( "email",     compare_email ),
        LIST_PROP ( "phone",     compare_phone ),
-       LIST_PROP ( "address",   compare_address ),
diff --git a/evolution-data-server-system_db.patch b/evolution-data-server-system_db.patch
index 12fd9e8913b6540129520367000296cc7bd240d2..d45da6b7007fde2b5f8d04e06abd2ea3a2a5d2d5 100644 (file)
--- a/evolution-data-server-system_db.patch
+++ b/evolution-data-server-system_db.patch
@@ -1,7 +1,18 @@
-diff -urN evolution-data-server-0.0.93.orig/configure.in evolution-data-server-0.0.93/configure.in
---- evolution-data-server-0.0.93.orig/configure.in     2004-05-22 12:08:38.934333552 +0200
-+++ evolution-data-server-0.0.93/configure.in  2004-05-22 12:11:03.053424120 +0200
-@@ -269,7 +269,6 @@
+diff -urN aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am     2004-10-14 17:50:17.000000000 +0200
++++ evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am        2005-02-07 17:12:29.879046432 +0100
+@@ -4,7 +4,6 @@
+       -I$(top_builddir)                               \
+       -I$(top_srcdir)/addressbook                     \
+       -I$(top_builddir)/addressbook                   \
+-      -I$(top_srcdir)/libdb/dist                      \
+         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ 
+ extension_LTLIBRARIES = libebookbackendfile.la
+diff -urN aa/evolution-data-server-1.1.4.2/configure.in evolution-data-server-1.1.4.2/configure.in
+--- aa/evolution-data-server-1.1.4.2/configure.in      2005-01-26 18:50:11.000000000 +0100
++++ evolution-data-server-1.1.4.2/configure.in 2005-02-07 17:09:29.476471792 +0100
+@@ -1163,7 +1163,6 @@
  export privincludedir
  export privdatadir
  AC_CONFIG_SUBDIRS(calendar/libical)
@@ -9,58 +20,56 @@ diff -urN evolution-data-server-0.0.93.orig/configure.in evolution-data-server-0
  
  AC_OUTPUT([
  Makefile
-@@ -301,7 +300,6 @@
- calendar/backends/contacts/Makefile
- calendar/tests/Makefile
- calendar/tests/ecal/Makefile
+@@ -1217,7 +1216,6 @@
+ camel/tests/stream/Makefile
+ camel/camel.pc
+ camel/camel-provider.pc
 -libdb/Makefile
  libedataserver/Makefile
- libedataserver/libedataserver-1.0.pc
- servers/Makefile
-diff -urN evolution-data-server-0.0.93.orig/libedataserver/Makefile.am evolution-data-server-0.0.93/libedataserver/Makefile.am
---- evolution-data-server-0.0.93.orig/libedataserver/Makefile.am       2004-05-22 12:08:37.715518840 +0200
-+++ evolution-data-server-0.0.93/libedataserver/Makefile.am    2004-05-22 12:10:23.587423864 +0200
+ libedataserver/libedataserver.pc
+ libedataserverui/Makefile
+diff -urN aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am evolution-data-server-1.1.4.2/libedataserver/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am        2005-01-10 17:00:02.000000000 +0100
++++ evolution-data-server-1.1.4.2/libedataserver/Makefile.am   2005-02-07 17:10:18.724984880 +0100
 @@ -1,7 +1,6 @@
  INCLUDES =                                                            \
        -I$(top_srcdir)                                                 \
        -DG_LOG_DOMAIN=\"e-data-server\"                                \
 -      -I$(top_srcdir)/libdb/dist                                      \
+       -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"                \
+       -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"                      \
        $(E_DATA_SERVER_CFLAGS)
- 
- # The marshallers
-@@ -33,9 +32,7 @@
-       e-xml-hash-utils.c              \
-       md5-utils.c
- 
--libedataserver_la_LIBADD =                            \
--      $(E_DATA_SERVER_LIBS)                           \
+@@ -44,7 +43,7 @@
+ libedataserver_1_2_la_LIBADD =                                \
+       $(E_DATA_SERVER_LIBS)                           \
+       $(ICONV_LIBS)                                   \
 -      $(top_builddir)/libdb/dist/libdb-4.1.la
-+libedataserver_la_LIBADD = -ldb
++      -ldb
  
- libedataserver_la_LDFLAGS =                                                                           \
+ libedataserver_1_2_la_LDFLAGS =                                                                               \
        -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)
-diff -urN evolution-data-server-0.0.93.orig/Makefile.am evolution-data-server-0.0.93/Makefile.am
---- evolution-data-server-0.0.93.orig/Makefile.am      2004-05-22 12:08:38.915336440 +0200
-+++ evolution-data-server-0.0.93/Makefile.am   2004-05-22 12:13:09.128257832 +0200
+diff -urN aa/evolution-data-server-1.1.4.2/Makefile.am evolution-data-server-1.1.4.2/Makefile.am
+--- aa/evolution-data-server-1.1.4.2/Makefile.am       2005-01-10 16:59:52.000000000 +0100
++++ evolution-data-server-1.1.4.2/Makefile.am  2005-02-07 17:11:27.480532448 +0100
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = 1.6
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  
--SUBDIRS = libdb libedataserver servers addressbook calendar src docs po
-+SUBDIRS = libedataserver servers addressbook calendar src docs po
- DIST_SUBDIRS= libedataserver servers addressbook calendar src docs po
+-SUBDIRS = libdb libedataserver servers camel addressbook calendar libedataserverui src docs art po
++SUBDIRS = libedataserver servers camel addressbook calendar libedataserverui src docs art po
+ DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui src docs art po
  
  changelogs =                  \
-@@ -22,9 +22,10 @@
-       intltool-merge.in       \
-       intltool-update.in      \
-       intltool-extract.in     \
--      $(pkgconfig_DATA:.pc=.pc.in) \
+@@ -26,9 +26,10 @@
+       intltool-merge.in                               \
+       intltool-update.in                              \
+       intltool-extract.in                             \
+-      $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)    \
 -      $(LIBDB_FILES)
-+      $(pkgconfig_DATA:.pc=.pc.in) 
++      $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
  
 +# files below should be removed due to system db patch, but they are left,
 +# so patch is small
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
  distclean-local:
        (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
Evolution data server
This page took 0.147266 seconds and 4 git commands to generate.