diff options
| author | Ross Burton <ross@openedhand.com> | 2005-11-03 15:23:10 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2005-11-03 15:23:10 +0000 |
| commit | 5764026b4a32b71f95d2d186b5c778975867b502 (patch) | |
| tree | ab7ff47d59ea61154c98f11561c82af7202575ff | |
| parent | b6858e3f6f2f033b102e8c004544840494814869 (diff) | |
| download | openembedded-core-5764026b4a32b71f95d2d186b5c778975867b502.tar.gz openembedded-core-5764026b4a32b71f95d2d186b5c778975867b502.tar.bz2 openembedded-core-5764026b4a32b71f95d2d186b5c778975867b502.zip | |
Remove gnomevfs patches, finally pushed them into svn
git-svn-id: https://svn.o-hand.com/repos/poky@161 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | openembedded/packages/eds/eds-dbus/no_gnomevfs.patch | 39 | ||||
| -rw-r--r-- | openembedded/packages/eds/eds-dbus/no_gnomevfs2.patch | 10 | ||||
| -rwxr-xr-x | openembedded/packages/eds/eds-dbus_svn.bb | 2 |
3 files changed, 0 insertions, 51 deletions
diff --git a/openembedded/packages/eds/eds-dbus/no_gnomevfs.patch b/openembedded/packages/eds/eds-dbus/no_gnomevfs.patch deleted file mode 100644 index cce73e1d36..0000000000 --- a/openembedded/packages/eds/eds-dbus/no_gnomevfs.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 -+++ trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 19:12:54.000000000 +0100 -@@ -29,7 +29,9 @@ - #include <dbus/dbus-glib.h> - #include <dbus/dbus-glib-bindings.h> - /**/ -+#if 0 - #include <libgnomevfs/gnome-vfs.h> -+#endif - #include <libedataserver/e-url.h> - #include <libedataserver/e-source.h> - #include <libedataserver/e-data-server-module.h> -@@ -403,10 +405,12 @@ - - loop = g_main_loop_new (NULL, FALSE); - -+#if 0 - if (!gnome_vfs_init ()) { - g_error ("Failed to initialise gnome-vfs"); - } -- -+#endif -+ - g_printerr ("Launching EDataCalFactory\n"); - - /* Obtain a connection to the session bus */ -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 -+++ trunk/configure.in 2005-10-04 19:12:07.000000000 +0100 -@@ -1203,7 +1203,7 @@ - - dnl --- evolution-calendar flags - --EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1" -+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1" - - EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) - AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) diff --git a/openembedded/packages/eds/eds-dbus/no_gnomevfs2.patch b/openembedded/packages/eds/eds-dbus/no_gnomevfs2.patch deleted file mode 100644 index 997508cc73..0000000000 --- a/openembedded/packages/eds/eds-dbus/no_gnomevfs2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- trunk/calendar/libecal-dbus/libecal.pc.in.old 2005-09-29 19:27:53.000000000 +0100 -+++ trunk/calendar/libecal-dbus/libecal.pc.in 2005-09-29 19:28:25.000000000 +0100 -@@ -11,6 +11,6 @@ - Name: libecal - Description: Client library for evolution calendars - Version: @VERSION@ --Requires: gnome-vfs-2.0 libedataserver-1.2 dbus-glib-1 -+Requires: libedataserver-1.2 dbus-glib-1 - Libs: -L${libdir} -lecal-1.2 - Cflags: -I${privincludedir} diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb index 99f24f6074..4366dccb61 100755 --- a/openembedded/packages/eds/eds-dbus_svn.bb +++ b/openembedded/packages/eds/eds-dbus_svn.bb @@ -8,8 +8,6 @@ PR = "r13" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libdb.patch;patch=1 \ - file://no_gnomevfs.patch;patch=1 \ - file://no_gnomevfs2.patch;patch=1 \ file://no_iconv_test.patch;patch=1 \ file://no_libedataserverui.patch;patch=1 \ file://iconv-detect.h" |