automatic version update by autodist [release 3.10.4-1mamba;Mon Feb 10 2014]
This commit is contained in:
parent
2df6158231
commit
efb39040de
@ -1,2 +1,3 @@
|
||||
# evolution
|
||||
|
||||
An integrated mail, addressbook and calendaring tool.
|
||||
|
941
evolution-pilot-link-0.12.patch
Normal file
941
evolution-pilot-link-0.12.patch
Normal file
@ -0,0 +1,941 @@
|
||||
Index: acinclude.m4
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/acinclude.m4,v
|
||||
retrieving revision 1.9
|
||||
diff -u -r1.9 acinclude.m4
|
||||
--- acinclude.m4 12 Jun 2006 12:52:02 -0000 1.9
|
||||
+++ acinclude.m4 17 Nov 2006 07:29:48 -0000
|
||||
@@ -268,3 +268,119 @@
|
||||
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
|
||||
AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
|
||||
])
|
||||
+
|
||||
+# PILOT_LINK_CHECK
|
||||
+# Adds --with-pisock and determines the verion of the pisock
|
||||
+#
|
||||
+
|
||||
+AC_SUBST(PISOCK_CFLAGS)
|
||||
+AC_SUBST(PISOCK_LIBS)
|
||||
+
|
||||
+AC_DEFUN([PILOT_LINK_HOOK],[
|
||||
+ AC_ARG_WITH(pisock,
|
||||
+ [ --with-pisock Specify prefix for pisock files],[
|
||||
+ if test x$withval = xyes; then
|
||||
+ dnl Note that an empty true branch is not valid sh syntax.
|
||||
+ ifelse([$1], [], :, [$1])
|
||||
+ else
|
||||
+ PISOCK_CFLAGS="-I$withval/include"
|
||||
+ incdir="$withval/include"
|
||||
+ PISOCK_LIBS="-L$withval/lib -lpisock -lpisync"
|
||||
+ AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
|
||||
+ if test -r $withval/lib/libpisock.so; then
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ else
|
||||
+ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.])
|
||||
+ fi
|
||||
+ fi
|
||||
+ ])
|
||||
+
|
||||
+ if test x$PISOCK_CFLAGS = x; then
|
||||
+ AC_CHECK_HEADER(pi-version.h, [incdir="/usr/include"], [
|
||||
+ AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_CFLAGS="-I/usr/include/libpisock"
|
||||
+ piversion_include="libpisock/pi-version.h"
|
||||
+ incdir="/usr/include/libpisock"
|
||||
+ ], [
|
||||
+ AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_CFLAGS="-I$prefix/include/libpisock"
|
||||
+ piversion_include="$prefix/include/pi-version.h"
|
||||
+ if test x$PISOCK_LIBDIR = x; then
|
||||
+ incdir="$prefix/include"
|
||||
+ PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync"
|
||||
+ fi ],
|
||||
+ AC_MSG_ERROR([Unable to find pi-version.h]))
|
||||
+ ])
|
||||
+ ])
|
||||
+ fi
|
||||
+
|
||||
+ if test "x$PISOCK_LIBS" = "x"; then
|
||||
+ AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS="-lpisock -lpisync"],
|
||||
+ [ AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.]) ])
|
||||
+ fi
|
||||
+
|
||||
+ AC_ARG_ENABLE(pilotlinktest,
|
||||
+ [ --enable-pilotlinktest Test for correct version of pilot-link],
|
||||
+ [testplversion=$enableval],
|
||||
+ [ testplversion=yes ]
|
||||
+ )
|
||||
+
|
||||
+ if test x$piversion_include = x; then
|
||||
+ piversion_include="pi-version.h"
|
||||
+ fi
|
||||
+
|
||||
+ pi_major=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_VERSION'|sed 's/#define PILOT_LINK_VERSION \([[0-9]]*\)/\1/'`
|
||||
+ pi_minor=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MAJOR'|sed 's/#define PILOT_LINK_MAJOR \([[0-9]]*\)/\1/'`
|
||||
+ pi_micro=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_MINOR'|sed 's/#define PILOT_LINK_MINOR \([[0-9]]*\)/\1/'`
|
||||
+ pi_patch=`cat $incdir/pi-version.h|grep '#define PILOT_LINK_PATCH'|sed 's/#define PILOT_LINK_PATCH \"\(.*\)\"/\1/'`
|
||||
+
|
||||
+ PILOT_LINK_MAJOR="$pi_major"
|
||||
+ PILOT_LINK_MINOR="$pi_minor"
|
||||
+ PILOT_LINK_MICRO="$pi_micro"
|
||||
+ PILOT_LINK_PATCH="$pi_patch"
|
||||
+ PILOT_LINK_VERSION="$pi_major.$pi_minor.$pi_micro$pi_patch"
|
||||
+
|
||||
+ if test x$testplversion = xyes; then
|
||||
+ AC_MSG_CHECKING([for pilot-link version >= $1])
|
||||
+ pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
+ pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
+ pl_mc=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
+ CFLAGS_save="$CFLAGS"
|
||||
+ CFLAGS="$CFLAGS $PISOCK_CFLAGS"
|
||||
+ AC_TRY_RUN(
|
||||
+ [
|
||||
+ #include <$piversion_include>
|
||||
+ int main(int argc,char *argv[]) {
|
||||
+ if (PILOT_LINK_VERSION == $pl_ma) {
|
||||
+ if (PILOT_LINK_MAJOR == $pl_mi) {
|
||||
+ if (PILOT_LINK_MINOR >= $pl_mc) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ } else if (PILOT_LINK_MAJOR > $pl_mi) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ } else if (PILOT_LINK_VERSION > $pl_ma) {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+ }
|
||||
+ ],
|
||||
+ [AC_MSG_RESULT([yes (found $PILOT_LINK_VERSION)])],
|
||||
+ [AC_MSG_ERROR([pilot-link >= $1 required])],
|
||||
+ [AC_MSG_WARN([No action taken for crosscompile])]
|
||||
+ )
|
||||
+ CFLAGS="$CFLAGS_save"
|
||||
+ fi
|
||||
+
|
||||
+ unset piversion_include
|
||||
+ unset pi_verion
|
||||
+ unset pi_major
|
||||
+ unset pi_minor
|
||||
+ unset pi_patch
|
||||
+ unset incdir
|
||||
+ unset pl_mi
|
||||
+ unset pl_ma
|
||||
+ unset pl_ve
|
||||
+])
|
||||
+
|
||||
+AC_DEFUN([PILOT_LINK_CHECK],[
|
||||
+ PILOT_LINK_HOOK($1,[],nofailure)
|
||||
+])
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/configure.in,v
|
||||
retrieving revision 1.920
|
||||
diff -u -r1.920 configure.in
|
||||
--- configure.in 14 Nov 2006 17:45:52 -0000 1.920
|
||||
+++ configure.in 17 Nov 2006 07:29:48 -0000
|
||||
@@ -606,8 +606,22 @@
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")
|
||||
-if test x$enable_pilot_conduits = xyes; then
|
||||
- msg_pilot=yes
|
||||
+dnl ******************************
|
||||
+dnl If pilot conduits are enabled, check version of pilot-link
|
||||
+dnl ******************************
|
||||
+ if test x$enable_pilot_conduits = xyes; then
|
||||
+ msg_pilot=yes
|
||||
+
|
||||
+ PILOT_LINK_CHECK(0.11.4)
|
||||
+ AC_SUBST(PILOT_LINK_MAJOR)
|
||||
+ AC_SUBST(PILOT_LINK_MINOR)
|
||||
+ AC_SUBST(PILOT_LINK_MICRO)
|
||||
+ AC_SUBST(PILOT_LINK_PATCH)
|
||||
+ AC_SUBST(PILOT_LINK_VERSION)
|
||||
+
|
||||
+ if test $PILOT_LINK_MINOR -ge 12; then
|
||||
+ AC_DEFINE(PILOT_LINK_0_12,,[Building against pilot-link 0.12.0 or greater])
|
||||
+ fi
|
||||
else
|
||||
msg_pilot=no
|
||||
fi
|
||||
Index: addressbook/conduit/address-conduit.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/addressbook/conduit/address-conduit.c,v
|
||||
retrieving revision 1.88
|
||||
diff -u -r1.88 address-conduit.c
|
||||
--- addressbook/conduit/address-conduit.c 6 Dec 2005 08:43:37 -0000 1.88
|
||||
+++ addressbook/conduit/address-conduit.c 17 Nov 2006 07:29:48 -0000
|
||||
@@ -462,6 +462,9 @@
|
||||
{
|
||||
static char buff[ 4096 ];
|
||||
struct Address addr;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
if (remote == NULL) {
|
||||
sprintf (buff, "[NULL]");
|
||||
@@ -469,7 +472,21 @@
|
||||
}
|
||||
|
||||
memset (&addr, 0, sizeof (struct Address));
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ unpack_Address (&addr, buffer, address_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
unpack_Address (&addr, remote->record, remote->length);
|
||||
+#endif
|
||||
|
||||
g_snprintf (buff, 4096, "['%s' '%s' '%s']",
|
||||
addr.entry[entryLastname] ?
|
||||
@@ -792,6 +809,9 @@
|
||||
{
|
||||
GnomePilotRecord p;
|
||||
static char record[0xffff];
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
g_assert (local->addr != NULL );
|
||||
|
||||
@@ -804,9 +824,25 @@
|
||||
p.secret = local->local.secret;
|
||||
|
||||
/* Generate pilot record structure */
|
||||
+
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return p;
|
||||
+ }
|
||||
+
|
||||
+ pack_Address (local->addr, buffer, address_v1);
|
||||
+
|
||||
+ p.record = g_new0(unsigned char, buffer->used);
|
||||
+ p.length = buffer->used;
|
||||
+ memcpy(p.record, buffer->data, buffer->used);
|
||||
+
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
p.record = record;
|
||||
p.length = pack_Address (local->addr, p.record, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -834,16 +870,34 @@
|
||||
*/
|
||||
if (local->local.ID != 0) {
|
||||
struct Address addr;
|
||||
- char record[0xffff];
|
||||
int cat = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * record;
|
||||
+ record = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(record == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return;
|
||||
+ }
|
||||
+#else
|
||||
+ char record[0xffff];
|
||||
+#endif
|
||||
|
||||
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||
ctxt->dbi->db_handle,
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ local->local.ID, record,
|
||||
+ NULL, NULL, &cat) > 0) {
|
||||
+#else
|
||||
local->local.ID, &record,
|
||||
NULL, NULL, NULL, &cat) > 0) {
|
||||
+#endif
|
||||
local->local.category = cat;
|
||||
memset (&addr, 0, sizeof (struct Address));
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ unpack_Address (&addr, record, address_v1);
|
||||
+#else
|
||||
unpack_Address (&addr, record, 0xffff);
|
||||
+#endif
|
||||
for (i = 0; i < 5; i++) {
|
||||
if (addr.entry[entryPhone1 + i])
|
||||
local->addr->entry[entryPhone1 + i] =
|
||||
@@ -858,6 +912,9 @@
|
||||
}
|
||||
free_Address (&addr);
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_free (record);
|
||||
+#endif
|
||||
}
|
||||
|
||||
local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
|
||||
@@ -1019,11 +1076,27 @@
|
||||
EContactField next_mail, next_home, next_work, next_fax;
|
||||
EContactField next_other, next_main, next_pager, next_mobile;
|
||||
int i;
|
||||
-
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
g_return_val_if_fail(remote!=NULL,NULL);
|
||||
memset (&address, 0, sizeof (struct Address));
|
||||
- unpack_Address (&address, remote->record, remote->length);
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ unpack_Address (&address, buffer, address_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
+ unpack_Address (&address, remote->record, remote->length);
|
||||
+#endif
|
||||
if (in_contact == NULL)
|
||||
contact = e_contact_new ();
|
||||
else
|
||||
@@ -1217,6 +1290,9 @@
|
||||
char *change_id;
|
||||
char *auth;
|
||||
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t *buffer;
|
||||
+#endif
|
||||
|
||||
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
|
||||
|
||||
@@ -1302,10 +1378,19 @@
|
||||
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
|
||||
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ return pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ }
|
||||
+
|
||||
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
+ DLP_BUF_SIZE, buffer);
|
||||
+#else
|
||||
buf = (unsigned char*)g_malloc (0xffff);
|
||||
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
(unsigned char *)buf, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
if (len < 0) {
|
||||
WARN (_("Could not read pilot's Address application block"));
|
||||
WARN ("dlp_ReadAppBlock(...) = %d", len);
|
||||
@@ -1313,9 +1398,13 @@
|
||||
_("Could not read pilot's Address application block"));
|
||||
return -1;
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
|
||||
+ pi_buffer_free (buffer);
|
||||
+#else
|
||||
unpack_AddressAppInfo (&(ctxt->ai), buf, len);
|
||||
g_free (buf);
|
||||
-
|
||||
+#endif
|
||||
check_for_slow_setting (conduit, ctxt);
|
||||
if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
|
||||
|| ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
|
||||
Index: calendar/conduits/calendar/calendar-conduit.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/calendar/conduits/calendar/calendar-conduit.c,v
|
||||
retrieving revision 1.132
|
||||
diff -u -r1.132 calendar-conduit.c
|
||||
--- calendar/conduits/calendar/calendar-conduit.c 23 Dec 2005 04:39:34 -0000 1.132
|
||||
+++ calendar/conduits/calendar/calendar-conduit.c 17 Nov 2006 07:29:48 -0000
|
||||
@@ -413,6 +413,9 @@
|
||||
{
|
||||
static char buff[ 4096 ];
|
||||
struct Appointment appt;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
if (remote == NULL) {
|
||||
sprintf (buff, "[NULL]");
|
||||
@@ -420,8 +423,22 @@
|
||||
}
|
||||
|
||||
memset (&appt, 0, sizeof (struct Appointment));
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+
|
||||
+ unpack_Appointment (&appt, buffer, datebook_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
unpack_Appointment (&appt, remote->record, remote->length);
|
||||
-
|
||||
+#endif
|
||||
g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
|
||||
mktime (&appt.begin),
|
||||
mktime (&appt.end),
|
||||
@@ -819,6 +836,9 @@
|
||||
{
|
||||
GnomePilotRecord p;
|
||||
static char record[0xffff];
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
g_assert (local->comp != NULL);
|
||||
g_assert (local->appt != NULL );
|
||||
@@ -830,9 +850,23 @@
|
||||
p.secret = local->local.secret;
|
||||
|
||||
/* Generate pilot record structure */
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return p;
|
||||
+ }
|
||||
+
|
||||
+ pack_Appointment (local->appt, buffer, datebook_v1);
|
||||
+ p.record = g_new0(unsigned char, buffer->used);
|
||||
+ p.length = buffer->used;
|
||||
+ memcpy(p.record, buffer->data, buffer->used);
|
||||
+
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
p.record = record;
|
||||
p.length = pack_Appointment (local->appt, p.record, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -867,22 +901,44 @@
|
||||
* we don't overwrite them
|
||||
*/
|
||||
if (local->local.ID != 0) {
|
||||
+ int cat = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ struct Appointment appt;
|
||||
+ pi_buffer_t * record;
|
||||
+
|
||||
+ record = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(record == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return;
|
||||
+ }
|
||||
+#else
|
||||
struct Appointment appt;
|
||||
char record[0xffff];
|
||||
- int cat = 0;
|
||||
-
|
||||
+#endif
|
||||
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||
ctxt->dbi->db_handle,
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ local->local.ID, record,
|
||||
+ NULL, NULL, &cat) > 0) {
|
||||
+#else
|
||||
local->local.ID, &record,
|
||||
NULL, NULL, NULL, &cat) > 0) {
|
||||
+#endif
|
||||
local->local.category = cat;
|
||||
memset (&appt, 0, sizeof (struct Appointment));
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ unpack_Appointment (&appt, record, datebook_v1);
|
||||
+#else
|
||||
unpack_Appointment (&appt, record, 0xffff);
|
||||
+#endif
|
||||
local->appt->alarm = appt.alarm;
|
||||
local->appt->advance = appt.advance;
|
||||
local->appt->advanceUnits = appt.advanceUnits;
|
||||
free_Appointment (&appt);
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_free (record);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/* STOP: don't replace these with g_strdup, since free_Appointment
|
||||
@@ -1140,12 +1196,28 @@
|
||||
GSList *edl = NULL;
|
||||
char *txt;
|
||||
int pos, i;
|
||||
-
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
g_return_val_if_fail (remote != NULL, NULL);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ unpack_Appointment (&appt, buffer, datebook_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+
|
||||
+#else
|
||||
memset (&appt, 0, sizeof (struct Appointment));
|
||||
unpack_Appointment (&appt, remote->record, remote->length);
|
||||
-
|
||||
+#endif
|
||||
if (in_comp == NULL) {
|
||||
comp = e_cal_component_new ();
|
||||
e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT);
|
||||
@@ -1413,7 +1485,9 @@
|
||||
char *filename, *change_id;
|
||||
icalcomponent *icalcomp;
|
||||
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||
-
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
|
||||
|
||||
LOG (g_message ( "---------------------------------------------------------\n" ));
|
||||
@@ -1521,10 +1595,21 @@
|
||||
gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
|
||||
gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
+ DLP_BUF_SIZE,
|
||||
+ buffer);
|
||||
+#else
|
||||
buf = (unsigned char*)g_malloc (0xffff);
|
||||
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
(unsigned char *)buf, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
if (len < 0) {
|
||||
WARN (_("Could not read pilot's Calendar application block"));
|
||||
WARN ("dlp_ReadAppBlock(...) = %d", len);
|
||||
@@ -1532,6 +1617,11 @@
|
||||
_("Could not read pilot's Calendar application block"));
|
||||
return -1;
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buf = g_new0 (unsigned char,buffer->used);
|
||||
+ memcpy(buf, buffer->data, buffer->used);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#endif
|
||||
unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
|
||||
g_free (buf);
|
||||
|
||||
Index: calendar/conduits/todo/todo-conduit.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/calendar/conduits/todo/todo-conduit.c,v
|
||||
retrieving revision 1.98
|
||||
diff -u -r1.98 todo-conduit.c
|
||||
--- calendar/conduits/todo/todo-conduit.c 13 May 2006 07:58:02 -0000 1.98
|
||||
+++ calendar/conduits/todo/todo-conduit.c 17 Nov 2006 07:29:48 -0000
|
||||
@@ -402,15 +402,30 @@
|
||||
{
|
||||
static char buff[ 4096 ];
|
||||
struct ToDo todo;
|
||||
-
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
if (remote == NULL) {
|
||||
sprintf (buff, "[NULL]");
|
||||
return buff;
|
||||
}
|
||||
|
||||
memset (&todo, 0, sizeof (struct ToDo));
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ unpack_ToDo (&todo, buffer, todo_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
unpack_ToDo (&todo, remote->record, remote->length);
|
||||
-
|
||||
+#endif
|
||||
g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
|
||||
todo.indefinite,
|
||||
mktime (&todo.due),
|
||||
@@ -594,7 +609,11 @@
|
||||
EToDoConduitContext *ctxt)
|
||||
{
|
||||
GnomePilotRecord p;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#else
|
||||
static char record[0xffff];
|
||||
+#endif
|
||||
|
||||
g_assert (local->comp != NULL);
|
||||
g_assert (local->todo != NULL );
|
||||
@@ -607,10 +626,24 @@
|
||||
p.archived = local->local.archived;
|
||||
p.secret = local->local.secret;
|
||||
|
||||
- /* Generate pilot record structure */
|
||||
+ /* Generate pilot record structure */
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return p;
|
||||
+ }
|
||||
+
|
||||
+ pack_ToDo (local->todo, buffer, todo_v1);
|
||||
+ p.record = g_new0(unsigned char, buffer->used);
|
||||
+ p.length = buffer->used;
|
||||
+ memcpy(p.record, buffer->data, buffer->used);
|
||||
+
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
p.record = record;
|
||||
p.length = pack_ToDo (local->todo, p.record, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -696,15 +729,32 @@
|
||||
|
||||
/* Don't overwrite the category */
|
||||
if (local->local.ID != 0) {
|
||||
- char record[0xffff];
|
||||
int cat = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * record;
|
||||
+ record = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(record == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return;
|
||||
+ }
|
||||
+#else
|
||||
+ char record[0xffff];
|
||||
+#endif
|
||||
|
||||
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||
ctxt->dbi->db_handle,
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ local->local.ID, record,
|
||||
+ NULL, NULL, &cat) > 0) {
|
||||
+#else
|
||||
local->local.ID, &record,
|
||||
NULL, NULL, NULL, &cat) > 0) {
|
||||
+#endif
|
||||
local->local.category = cat;
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_free(record);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -860,11 +910,28 @@
|
||||
int priority;
|
||||
char *txt;
|
||||
char *category;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
g_return_val_if_fail (remote != NULL, NULL);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ unpack_ToDo (&todo, buffer, todo_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
memset (&todo, 0, sizeof (struct ToDo));
|
||||
unpack_ToDo (&todo, remote->record, remote->length);
|
||||
+#endif
|
||||
|
||||
utc_zone = icaltimezone_get_utc_timezone ();
|
||||
now = icaltime_from_timet_with_zone (time (NULL), FALSE,
|
||||
@@ -1018,6 +1085,9 @@
|
||||
char *filename, *change_id;
|
||||
icalcomponent *icalcomp;
|
||||
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
|
||||
|
||||
@@ -1104,10 +1174,20 @@
|
||||
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
|
||||
num_records, add_records, mod_records, del_records);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
+ DLP_BUF_SIZE,
|
||||
+ buffer);
|
||||
+#else
|
||||
buf = (unsigned char*)g_malloc (0xffff);
|
||||
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
(unsigned char *)buf, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
if (len < 0) {
|
||||
WARN (_("Could not read pilot's ToDo application block"));
|
||||
WARN ("dlp_ReadAppBlock(...) = %d", len);
|
||||
@@ -1115,6 +1195,12 @@
|
||||
_("Could not read pilot's ToDo application block"));
|
||||
return -1;
|
||||
}
|
||||
+
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buf = g_new0 (unsigned char,buffer->used);
|
||||
+ memcpy(buf, buffer->data,buffer->used);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#endif
|
||||
unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
|
||||
g_free (buf);
|
||||
|
||||
Index: calendar/conduits/memo/memo-conduit.c
|
||||
===================================================================
|
||||
RCS file: /cvs/gnome/evolution/calendar/conduits/memo/memo-conduit.c,v
|
||||
retrieving revision 1.1
|
||||
diff -u -r1.1 memo-conduit.c
|
||||
--- calendar/conduits/memo/memo-conduit.c 19 Oct 2005 11:39:35 -0000 1.1
|
||||
+++ calendar/conduits/memo/memo-conduit.c 17 Nov 2006 07:29:48 -0000
|
||||
@@ -331,6 +331,9 @@
|
||||
{
|
||||
static char buff[ 64 ];
|
||||
struct Memo memo;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t *buffer;
|
||||
+#endif
|
||||
|
||||
if (remote == NULL) {
|
||||
sprintf (buff, "[NULL]");
|
||||
@@ -338,8 +341,22 @@
|
||||
}
|
||||
|
||||
memset (&memo, 0, sizeof (struct Memo));
|
||||
- unpack_Memo (&memo, remote->record, remote->length);
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ sprintf (buff, "[NULL]");
|
||||
+ return buff;
|
||||
+ }
|
||||
+ unpack_Memo (&memo, buffer, memo_v1);
|
||||
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
+ unpack_Memo (&memo, remote->record, remote->length);
|
||||
+#endif
|
||||
g_snprintf (buff, 64, "['%s']",
|
||||
memo.text ?
|
||||
memo.text : "");
|
||||
@@ -452,6 +469,9 @@
|
||||
{
|
||||
GnomePilotRecord p;
|
||||
static char record[0xffff];
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
g_assert (local->comp != NULL);
|
||||
g_assert (local->memo != NULL );
|
||||
@@ -465,9 +485,23 @@
|
||||
p.secret = local->local.secret;
|
||||
|
||||
/* Generate pilot record structure */
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return p;
|
||||
+ }
|
||||
+
|
||||
+ pack_Memo (local->memo, buffer, memo_v1);
|
||||
+ p.record = g_new0(unsigned char, buffer->used);
|
||||
+ p.length = buffer->used;
|
||||
+ memcpy(p.record, buffer->data, buffer->used);
|
||||
+
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
p.record = record;
|
||||
p.length = pack_Memo (local->memo, p.record, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
return p;
|
||||
}
|
||||
|
||||
@@ -568,16 +602,41 @@
|
||||
|
||||
/* Don't overwrite the category */
|
||||
if (local->local.ID != 0) {
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ struct Memo memo;
|
||||
+ pi_buffer_t * record;
|
||||
+#else
|
||||
char record[0xffff];
|
||||
+#endif
|
||||
int cat = 0;
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ record = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(record == NULL){
|
||||
+ pi_set_error(ctxt->dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
|
||||
if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
|
||||
ctxt->dbi->db_handle,
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ local->local.ID, record,
|
||||
+ NULL, NULL, &cat) > 0) {
|
||||
+ local->local.category = cat;
|
||||
+ memset (&memo, 0, sizeof (struct Memo));
|
||||
+ unpack_Memo (&memo, record, memo_v1);
|
||||
+ local->memo->text = strdup (memo.text);
|
||||
+ free_Memo (&memo);
|
||||
+ }
|
||||
+ pi_buffer_free (record);
|
||||
+#else
|
||||
local->local.ID, &record,
|
||||
NULL, NULL, NULL, &cat) > 0) {
|
||||
local->local.category = cat;
|
||||
- }
|
||||
+ }
|
||||
+#endif
|
||||
LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
|
||||
}
|
||||
|
||||
@@ -704,11 +763,27 @@
|
||||
char *txt, *txt2, *txt3;
|
||||
char *category;
|
||||
int i;
|
||||
-
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
g_return_val_if_fail (remote != NULL, NULL);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if(pi_buffer_append(buffer, remote->record, remote->length)==NULL){
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ unpack_Memo (&memo, buffer, memo_v1);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
memset (&memo, 0, sizeof (struct Memo));
|
||||
unpack_Memo (&memo, remote->record, remote->length);
|
||||
+#endif
|
||||
|
||||
utc_zone = icaltimezone_get_utc_timezone ();
|
||||
now = icaltime_from_timet_with_zone (time (NULL), FALSE,
|
||||
@@ -840,6 +915,9 @@
|
||||
char *filename, *change_id;
|
||||
icalcomponent *icalcomp;
|
||||
gint num_records, add_records = 0, mod_records = 0, del_records = 0;
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ pi_buffer_t * buffer;
|
||||
+#endif
|
||||
|
||||
abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
|
||||
|
||||
@@ -929,10 +1007,21 @@
|
||||
g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
|
||||
num_records, add_records, mod_records, del_records);
|
||||
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buffer = pi_buffer_new(DLP_BUF_SIZE);
|
||||
+ if(buffer == NULL){
|
||||
+ pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
+ DLP_BUF_SIZE,
|
||||
+ buffer);
|
||||
+#else
|
||||
buf = (unsigned char*)g_malloc (0xffff);
|
||||
len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
|
||||
(unsigned char *)buf, 0xffff);
|
||||
-
|
||||
+#endif
|
||||
if (len < 0) {
|
||||
WARN (_("Could not read pilot's Memo application block"));
|
||||
WARN ("dlp_ReadAppBlock(...) = %d", len);
|
||||
@@ -940,7 +1029,15 @@
|
||||
_("Could not read pilot's Memo application block"));
|
||||
return -1;
|
||||
}
|
||||
+#ifdef PILOT_LINK_0_12
|
||||
+ buf = g_new0 (unsigned char,buffer->used);
|
||||
+ memcpy(buf, buffer->data, buffer->used);
|
||||
+ unpack_MemoAppInfo (&(ctxt->ai), buf, len);
|
||||
+ pi_buffer_free(buffer);
|
||||
+#else
|
||||
unpack_MemoAppInfo (&(ctxt->ai), buf, len);
|
||||
+#endif
|
||||
+
|
||||
g_free (buf);
|
||||
|
||||
lastDesktopUniqueID = 128;
|
466
evolution.spec
Normal file
466
evolution.spec
Normal file
@ -0,0 +1,466 @@
|
||||
%define majversion %(echo %version | cut -d. -f 1-2)
|
||||
%define apiver %{majversion}
|
||||
Name: evolution
|
||||
Version: 3.10.4
|
||||
Release: 1mamba
|
||||
Summary: An integrated mail, addressbook and calendaring tool
|
||||
Group: Graphical Desktop/Applications/Office
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.gnome.org/projects/evolution/
|
||||
Source: http://ftp.gnome.org/pub/gnome/sources/evolution/%{majversion}/%{name}-%{version}.tar.xz
|
||||
Patch0: evolution-pilot-link-0.12.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: GConf-devel
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: gnome-desktop-devel
|
||||
BuildRequires: gnome-icon-theme
|
||||
BuildRequires: gnome-online-accounts-devel
|
||||
BuildRequires: libatk-devel
|
||||
BuildRequires: libbzip2-devel
|
||||
BuildRequires: libcairo-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: libdb51-devel
|
||||
BuildRequires: libdbus-devel
|
||||
BuildRequires: libdbus-glib-devel
|
||||
BuildRequires: libe2fs-devel
|
||||
BuildRequires: libelf-devel
|
||||
BuildRequires: libenchant-devel
|
||||
BuildRequires: libevolution-data-server-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libffi-devel
|
||||
BuildRequires: libfontconfig-devel
|
||||
BuildRequires: libfreetype-devel
|
||||
BuildRequires: libgcr-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libgdata-devel
|
||||
BuildRequires: libgdk-pixbuf-devel
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libglib-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: libgstreamer-devel
|
||||
BuildRequires: libgtk-devel
|
||||
BuildRequires: libgtkhtml-devel
|
||||
BuildRequires: libgweather-devel
|
||||
BuildRequires: libical-devel
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libkrb5-devel
|
||||
BuildRequires: liblzma-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libnspr-devel
|
||||
BuildRequires: libnss-devel
|
||||
BuildRequires: liboauth-devel
|
||||
BuildRequires: libopenldap-devel
|
||||
BuildRequires: libpango-devel
|
||||
BuildRequires: libpixman-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libpst-devel
|
||||
BuildRequires: libpthread-stubs-devel
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libsoup-devel
|
||||
BuildRequires: libsqlite-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXau-devel
|
||||
BuildRequires: libxcb-devel
|
||||
BuildRequires: libXcomposite-devel
|
||||
BuildRequires: libXcursor-devel
|
||||
BuildRequires: libXdamage-devel
|
||||
BuildRequires: libXdmcp-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXfixes-devel
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libXrandr-devel
|
||||
BuildRequires: libXrender-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: ORBit2-devel
|
||||
BuildRequires: p11-kit-devel
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: udev-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: intltool
|
||||
BuildRequires: perl-XML-Parser
|
||||
#BuildRequires: libgnomeprint-devel
|
||||
#BuildRequires: libgnomeui-devel
|
||||
#BuildRequires: libgnomeprintui-devel
|
||||
#BuildRequires: libgtkimageview-devel
|
||||
BuildRequires: libpst-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: libgst-plugins-base-devel
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: flex, bison
|
||||
BuildRequires: gnome-doc-utils-devel >= 0.3.2
|
||||
BuildRequires: shared-mime-info
|
||||
BuildRequires: gnome-online-accounts-devel
|
||||
BuildRequires: bogofilter
|
||||
BuildRequires: highlight
|
||||
BuildRequires: SpamAssassin
|
||||
BuildRequires: gnome-desktop-devel >= %{majversion}
|
||||
BuildRequires: libevolution-data-server-devel >= %{majversion}
|
||||
BuildRequires: libgweather-devel >= %{majversion}
|
||||
Requires: gnome-icon-theme >= 1.2.0
|
||||
Requires: bogofilter
|
||||
Requires: SpamAssassin
|
||||
Provides: evolution-gnome-pilot
|
||||
Obsoletes: evolution-gnome-pilot
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
# FIXME:
|
||||
# checking for NM... checking for NM... yes
|
||||
# pkg-config --exists --print-errors "dbus-glib-1 libnm_glib"
|
||||
#
|
||||
# checking for NetworkManager/NetworkManager.h... no
|
||||
#
|
||||
# checking for SOUPTEMP...
|
||||
# pkg-config --exists --print-errors "libsoup-2.4"
|
||||
|
||||
%description
|
||||
An integrated mail, addressbook and calendaring tool.
|
||||
|
||||
#%package gnome-pilot
|
||||
#Group: Graphical Desktop/Applications/Office
|
||||
#Summary: Evolution conduits for gnome-pilot
|
||||
#Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
#Requires: gnome-pilot >= 2.0.11
|
||||
#
|
||||
#%description gnome-pilot
|
||||
#Evolution is a project to provide integrated mail, addressbook and calendaring functionality to the GNOME desktop.
|
||||
#
|
||||
#This package contains conduits needed by gnome-pilot to synchronize your Palm with Evolution.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: Static libraries and headers for %{name}
|
||||
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Evolution is a project to provide integrated mail, addressbook and calendaring functionality to the GNOME desktop.
|
||||
This package contains static libraries and header files need for development.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#-D -T
|
||||
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_provides %{_builddir}/evolution-%{version}/find_provides.sh
|
||||
cat > %{_builddir}/evolution-%{version}/find_provides.sh <<_EOF
|
||||
#! /bin/sh
|
||||
grep -v %{buildroot}%{_libdir}/evolution | \
|
||||
%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu}
|
||||
_EOF
|
||||
chmod +x %{_builddir}/evolution-%{version}/find_provides.sh
|
||||
|
||||
%define __find_requires %{_builddir}/evolution-%{version}/find_requires.sh
|
||||
cat > %{_builddir}/evolution-%{version}/find_requires.sh <<_EOF
|
||||
#! /bin/sh
|
||||
%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null |
|
||||
while read line; do
|
||||
[ ! -f %{buildroot}%{_libdir}/evolution/%{majversion}/\${line/\(*} ] && echo "\$line"
|
||||
done
|
||||
_EOF
|
||||
chmod +x %{_builddir}/evolution-%{version}/find_requires.sh
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
%configure \
|
||||
--with-openldap=yes \
|
||||
--with-krb5=%{_prefix} \
|
||||
--enable-nss=yes \
|
||||
--enable-smime=yes \
|
||||
--enable-plugins=all \
|
||||
--enable-pilot-conduits=yes \
|
||||
--disable-scrollkeeper \
|
||||
--disable-image-inline
|
||||
# FIXME: for --disable-image-inline see http://mail.gnome.org/archives/evolution-hackers/2011-January/msg00052.html
|
||||
# --with-kde-applnk-path=%{_datadir}/applnk
|
||||
|
||||
%make
|
||||
#CFLAGS="-DPILOT_LINK_0_12"
|
||||
|
||||
%install
|
||||
[ %{buildroot} != / ] && rm -rf %{buildroot}
|
||||
%makeinstall
|
||||
|
||||
%find_lang %{name}-%{apiver}
|
||||
|
||||
%clean
|
||||
[ %{buildroot} != / ] && rm -rf %{buildroot}
|
||||
|
||||
%files -f %{name}-%{apiver}.lang
|
||||
%defattr(-,root,root)
|
||||
#%{_sysconfdir}/gconf/schemas/*.schemas
|
||||
%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
|
||||
%{_bindir}/evolution
|
||||
#%{_bindir}/evolution-settings
|
||||
%dir %{_libdir}/evolution
|
||||
%dir %{_libdir}/evolution/%{apiver}
|
||||
%{_libdir}/evolution/%{apiver}/*.la
|
||||
%{_libdir}/evolution/%{apiver}/*.so
|
||||
%{_libdir}/evolution/%{apiver}/*/*.la
|
||||
%{_libdir}/evolution/%{apiver}/*/*.so
|
||||
%{_libdir}/evolution/%{apiver}/plugins/*.eplug
|
||||
%{_datadir}/appdata/evolution.appdata.xml
|
||||
%dir %{_datadir}/evolution
|
||||
%dir %{_datadir}/evolution/%{apiver}
|
||||
%{_datadir}/evolution/%{apiver}/*
|
||||
%{_datadir}/applications/evolution.desktop
|
||||
#%{_datadir}/applications/evolution-settings.desktop
|
||||
%{_datadir}/GConf/gsettings/evolution.convert
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.*.xml
|
||||
%dir %{_datadir}/help/*/evolution
|
||||
%{_datadir}/help/*/evolution/*
|
||||
#%{_datadir}/omf/evolution/
|
||||
#%{_datadir}/mime-info/evolution.*
|
||||
%{_datadir}/icons/hicolor/*/apps/evolution.png
|
||||
%{_datadir}/icons/hicolor/*/apps/evolution-mail.png
|
||||
%{_datadir}/icons/hicolor/*/apps/evolution-memos.png
|
||||
%{_datadir}/icons/hicolor/*/apps/evolution-tasks.png
|
||||
%{_libexecdir}/evolution
|
||||
#%{_libdir}/evolution/%{majversion}/plugins/*.xml
|
||||
%doc AUTHORS COPYING
|
||||
|
||||
#%files gnome-pilot
|
||||
#%defattr(-,root,root)
|
||||
#%{_datadir}/gnome-pilot/conduits/*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/evolution-%{apiver}
|
||||
%{_includedir}/evolution-%{apiver}/*
|
||||
%{_libdir}/pkgconfig/evolution-calendar-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-mail-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-plugin-3.0.pc
|
||||
%{_libdir}/pkgconfig/evolution-shell-3.0.pc
|
||||
%{_libdir}/pkgconfig/libemail-engine.pc
|
||||
#%{_libdir}/pkgconfig/libemail-utils.pc
|
||||
#%{_libdir}/pkgconfig/libevolution-utils.pc
|
||||
%dir %{_datadir}/gtk-doc/html/evolution-mail-composer
|
||||
%{_datadir}/gtk-doc/html/evolution-mail-composer/*
|
||||
%dir %{_datadir}/gtk-doc/html/evolution-mail-formatter
|
||||
%{_datadir}/gtk-doc/html/evolution-mail-formatter/*
|
||||
%dir %{_datadir}/gtk-doc/html/evolution-shell
|
||||
%{_datadir}/gtk-doc/html/evolution-shell/*
|
||||
%dir %{_datadir}/gtk-doc/html/evolution-util
|
||||
%{_datadir}/gtk-doc/html/evolution-util/*
|
||||
%doc ChangeLog NEWS README
|
||||
|
||||
%changelog
|
||||
* Mon Feb 10 2014 Automatic Build System <autodist@mambasoft.it> 3.10.4-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Dec 09 2013 Automatic Build System <autodist@mambasoft.it> 3.10.3-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Nov 12 2013 Automatic Build System <autodist@mambasoft.it> 3.10.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Nov 05 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 3.10.1-3mamba
|
||||
- rebuilt with libgweather 3.10
|
||||
|
||||
* Sat Nov 02 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 3.10.1-2mamba
|
||||
- rebuilt with gnome-desktop 3.10
|
||||
|
||||
* Tue Oct 29 2013 Automatic Build System <autodist@mambasoft.it> 3.10.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Aug 11 2013 Automatic Build System <autodist@mambasoft.it> 3.8.5-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Aug 02 2013 Automatic Build System <autodist@mambasoft.it> 3.8.4-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon May 20 2013 Automatic Build System <autodist@mambasoft.it> 3.8.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Apr 14 2013 Automatic Build System <autodist@mambasoft.it> 3.8.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Apr 13 2013 Automatic Build System <autodist@mambasoft.it> 3.8.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Mar 07 2013 Automatic Build System <autodist@mambasoft.it> 3.6.4-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Jan 21 2013 Automatic Build System <autodist@mambasoft.it> 3.6.3-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Dec 07 2012 Automatic Build System <autodist@mambasoft.it> 3.6.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Oct 14 2012 Automatic Build System <autodist@mambasoft.it> 3.6.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Oct 06 2012 Automatic Build System <autodist@mambasoft.it> 3.6.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Sep 14 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 3.4.4-3mamba
|
||||
- remove provides/requires for internal plugin libraries
|
||||
|
||||
* Sat Aug 25 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 3.4.4-2mamba
|
||||
- move plugin libraries *.la and *.so from devel to main package
|
||||
|
||||
* Mon Aug 13 2012 Automatic Build System <autodist@mambasoft.it> 3.4.4-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Aug 04 2012 Automatic Build System <autodist@mambasoft.it> 3.4.3-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Jun 14 2012 Automatic Build System <autodist@mambasoft.it> 3.4.2-1mamba
|
||||
- update to 3.4.2
|
||||
|
||||
* Sat Apr 07 2012 Automatic Build System <autodist@mambasoft.it> 3.4.0.1-1mamba
|
||||
- update to 3.4.0.1
|
||||
|
||||
* Wed Aug 31 2011 Automatic Build System <autodist@mambasoft.it> 3.0.3-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Jul 25 2011 Automatic Build System <autodist@mambasoft.it> 3.0.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Feb 07 2011 Automatic Build System <autodist@mambasoft.it> 2.32.2-1mamba
|
||||
- automatic update by autodist
|
||||
|
||||
* Mon Nov 15 2010 Automatic Build System <autodist@mambasoft.it> 2.32.1-1mamba
|
||||
- automatic update to 2.32.1 by autodist
|
||||
|
||||
* Tue Nov 09 2010 Automatic Build System <autodist@mambasoft.it> 2.32.0-1mamba
|
||||
- automatic update to 2.32.0 by autodist
|
||||
|
||||
* Fri Aug 13 2010 Automatic Build System <autodist@mambasoft.it> 2.30.3-1mamba
|
||||
- automatic update to 2.30.3 by autodist
|
||||
|
||||
* Fri Jun 25 2010 Automatic Build System <autodist@mambasoft.it> 2.30.2-1mamba
|
||||
- automatic update to 2.30.2 by autodist
|
||||
|
||||
* Tue May 11 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 2.30.1.2-1mamba
|
||||
- update to 2.30.1.2
|
||||
|
||||
* Mon Mar 15 2010 Automatic Build System <autodist@mambasoft.it> 2.28.3.1-1mamba
|
||||
- automatic update to 2.28.3.1 by autodist
|
||||
|
||||
* Mon Dec 14 2009 Automatic Build System <autodist@mambasoft.it> 2.28.2-1mamba
|
||||
- automatic update to 2.28.2 by autodist
|
||||
|
||||
* Sun Oct 18 2009 Automatic Build System <autodist@mambasoft.it> 2.28.1-1mamba
|
||||
- automatic update to 2.28.1 by autodist
|
||||
|
||||
* Fri Oct 09 2009 Automatic Build System <autodist@mambasoft.it> 2.28.0-1mamba
|
||||
- automatic update to 2.28.0 by autodist
|
||||
|
||||
* Mon Jun 29 2009 Automatic Build System <autodist@mambasoft.it> 2.26.3-1mamba
|
||||
- automatic update to 2.26.3 by autodist
|
||||
|
||||
* Mon May 18 2009 Automatic Build System <autodist@mambasoft.it> 2.26.2-1mamba
|
||||
- automatic update to 2.26.2 by autodist
|
||||
|
||||
* Sun May 17 2009 Automatic Build System <autodist@mambasoft.it> 2.26.1.1-2mamba
|
||||
- automatic rebuild by autodist
|
||||
|
||||
* Fri Apr 17 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.26.1.1-1mamba
|
||||
- automatic update to 2.26.1.1 by autodist
|
||||
|
||||
* Tue Apr 14 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.26.1-1mamba
|
||||
- automatic update to 2.26.1 by autodist
|
||||
|
||||
* Mon Mar 30 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.26.0-1mamba
|
||||
- automatic update to 2.26.0 by autodist
|
||||
|
||||
* Wed Feb 25 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.5-1mamba
|
||||
- automatic update to 2.24.5 by autodist
|
||||
|
||||
* Mon Feb 23 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.4-2mamba
|
||||
- automatic rebuild by autodist
|
||||
|
||||
* Tue Feb 17 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.4-1mamba
|
||||
- automatic update to 2.24.4 by autodist
|
||||
|
||||
* Mon Jan 12 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.3-1mamba
|
||||
- automatic update to 2.24.3 by autodist
|
||||
|
||||
* Mon Nov 24 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.2-1mamba
|
||||
- automatic update to 2.24.2 by autodist
|
||||
|
||||
* Mon Nov 17 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.1.1-1mamba
|
||||
- automatic update to 2.24.1.1 by autodist
|
||||
|
||||
* Tue Oct 21 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.1-1mamba
|
||||
- automatic update to 2.24.1 by autodist
|
||||
|
||||
* Tue Sep 30 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.24.0-1mamba
|
||||
- automatic update to 2.24.0 by autodist
|
||||
|
||||
* Fri Aug 29 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.22.3.1-1mamba
|
||||
- update to 2.22.3.1
|
||||
|
||||
* Tue Jun 03 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.22.2-1mamba
|
||||
- update to 2.22.2
|
||||
|
||||
* Thu May 08 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.22.1.1-1mamba
|
||||
- update to 2.22.1.1
|
||||
|
||||
* Fri Apr 11 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.22.1-1mamba
|
||||
- update to 2.22.1
|
||||
|
||||
* Mon Sep 17 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 2.10.3-1mamba
|
||||
- update to 2.10.3
|
||||
|
||||
* Tue Feb 27 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.2.1-3qilnx
|
||||
- oops, rebuilding now against gstreamer 0.10
|
||||
|
||||
* Sun Feb 25 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.2.1-2qilnx
|
||||
- rebuild against gstreamer 0.10
|
||||
|
||||
* Sat Jan 13 2007 Davide Madrisan <davide.madrisan@qilinux.it> 2.8.2.1-1qilnx
|
||||
- update to version 2.8.2.1 by autospec
|
||||
|
||||
* Wed Nov 30 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.4.2-1qilnx
|
||||
- update to version 2.4.2 by autospec
|
||||
- enabled support for building pilot conduits
|
||||
- new package %{name}-gnome-pilot
|
||||
|
||||
* Fri Sep 16 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.4.0-2qilnx
|
||||
- rebuilt to enable LDAP NTLM bind support
|
||||
|
||||
* Thu Sep 15 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.4.0-1qilnx
|
||||
- update to version 2.4.0 by autospec
|
||||
- removed security patch
|
||||
- added some missing build requirements
|
||||
- build with SSL and SMIME support (Mozilla NSS)
|
||||
- build with Kerberos V support
|
||||
|
||||
* Wed Aug 31 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.2.3-2qilnx
|
||||
- fixed security issue QSA-2005-098 (CAN-2005-2549, CAN-2005-2550)
|
||||
|
||||
* Tue Jun 07 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.2.3-1qilnx
|
||||
- update to version 2.2.3 by autospec
|
||||
|
||||
* Fri May 27 2005 Davide Madrisan <davide.madrisan@qilinux.it> 2.2.1.1-3qilnx
|
||||
- requires gnome-icon-theme package
|
||||
- added missing build requirements
|
||||
- added development documentation via gtk-doc
|
||||
|
||||
* Thu Apr 07 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.1.1-2qilnx
|
||||
- remove duplicate KDE menu link
|
||||
- fix Group entry
|
||||
|
||||
* Fri Mar 18 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.1.1-1qilnx
|
||||
- update to version 2.2.1.1 by autospec
|
||||
|
||||
* Thu Dec 30 2004 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.3-1qilnx
|
||||
- new version build
|
||||
|
||||
* Mon Oct 18 2004 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.2-1qilnx
|
||||
- new version build
|
||||
|
||||
* Mon Oct 11 2004 Massimo Pintore <massimo.pintore@qilinux.it> 2.0.1-1qilnx
|
||||
- package created by autospec
|
Loading…
Reference in New Issue
Block a user