Update patches for latest SVN
git-svn-id: https://svn.o-hand.com/repos/poky@148 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
d1dae06dc1
commit
f7a060b481
|
@ -1,28 +1,3 @@
|
||||||
diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/addressbook/libebook/e-contact.c trunk/addressbook/libebook/e-contact.c
|
|
||||||
--- ../eds-dbus-1.4.0cvs20051004-r7/trunk/addressbook/libebook/e-contact.c 2005-10-04 18:08:14.000000000 +0100
|
|
||||||
+++ trunk/addressbook/libebook/e-contact.c 2005-10-04 19:11:37.000000000 +0100
|
|
||||||
@@ -27,7 +27,9 @@
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <glib/gi18n-lib.h>
|
|
||||||
+#if 0
|
|
||||||
#include <libgnomevfs/gnome-vfs-mime-utils.h>
|
|
||||||
+#endif
|
|
||||||
#include "e-contact.h"
|
|
||||||
#include "e-book.h"
|
|
||||||
#include "e-name-western.h"
|
|
||||||
@@ -419,7 +421,11 @@
|
|
||||||
e_vcard_attribute_param_new (EVC_ENCODING),
|
|
||||||
"b");
|
|
||||||
|
|
||||||
+#if 0
|
|
||||||
mime_type = gnome_vfs_get_mime_type_for_data (photo->inlined.data, photo->inlined.length);
|
|
||||||
+#else
|
|
||||||
+ mime_type = "image/jpeg";
|
|
||||||
+#endif
|
|
||||||
if (!strcmp (mime_type, "image/gif"))
|
|
||||||
image_type = "GIF";
|
|
||||||
else if (!strcmp (mime_type, "image/jpeg"))
|
|
||||||
diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c
|
diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c
|
||||||
--- ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 18:08:34.000000000 +0100
|
--- ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 18:08:34.000000000 +0100
|
||||||
+++ trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 19:12:54.000000000 +0100
|
+++ trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 19:12:54.000000000 +0100
|
||||||
|
@ -53,15 +28,6 @@ diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-da
|
||||||
diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in trunk/configure.in
|
diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in trunk/configure.in
|
||||||
--- ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in 2005-10-04 19:14:49.000000000 +0100
|
--- ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in 2005-10-04 19:14:49.000000000 +0100
|
||||||
+++ trunk/configure.in 2005-10-04 19:12:07.000000000 +0100
|
+++ trunk/configure.in 2005-10-04 19:12:07.000000000 +0100
|
||||||
@@ -1195,7 +1195,7 @@
|
|
||||||
|
|
||||||
dnl --- evolution-addressbook flags
|
|
||||||
|
|
||||||
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 "
|
|
||||||
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS"
|
|
||||||
|
|
||||||
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
|
|
||||||
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
|
|
||||||
@@ -1203,7 +1203,7 @@
|
@@ -1203,7 +1203,7 @@
|
||||||
|
|
||||||
dnl --- evolution-calendar flags
|
dnl --- evolution-calendar flags
|
||||||
|
|
|
@ -6,8 +6,8 @@ Index: Makefile.am
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ENABLE_DBUS
|
if ENABLE_DBUS
|
||||||
-SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po
|
-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po
|
||||||
+SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar docs art po
|
+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook calendar docs art po
|
||||||
else
|
else
|
||||||
SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
|
SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
LICENSE = "LGPL"
|
LICENSE = "LGPL"
|
||||||
DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
|
DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
|
||||||
RDEPENDS = "gtk+ gconf db libiconv"
|
RDEPENDS = "gconf dbus db libiconv"
|
||||||
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
MAINTAINER = "Chris Lord <chris@openedhand.com>"
|
||||||
DESCRIPTION = "Evolution database backend server"
|
DESCRIPTION = "Evolution database backend server"
|
||||||
PV = "1.4.0cvs${CVSDATE}"
|
PV = "1.4.0cvs${CVSDATE}"
|
||||||
PR = "r11"
|
PR = "r12"
|
||||||
|
|
||||||
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
|
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
|
||||||
file://no_gnomevfs.patch;patch=1 \
|
file://no_gnomevfs.patch;patch=1 \
|
||||||
|
|
Loading…
Reference in New Issue