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 /openembedded | |
| parent | b6858e3f6f2f033b102e8c004544840494814869 (diff) | |
| download | poky-5764026b4a32b71f95d2d186b5c778975867b502.tar.gz | |
Remove gnomevfs patches, finally pushed them into svn
git-svn-id: https://svn.o-hand.com/repos/poky@161 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
| -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 @@ | |||
| 1 | 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 | ||
| 2 | --- ../eds-dbus-1.4.0cvs20051004-r7/trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 18:08:34.000000000 +0100 | ||
| 3 | +++ trunk/calendar/libedata-cal-dbus/e-data-cal-factory.c 2005-10-04 19:12:54.000000000 +0100 | ||
| 4 | @@ -29,7 +29,9 @@ | ||
| 5 | #include <dbus/dbus-glib.h> | ||
| 6 | #include <dbus/dbus-glib-bindings.h> | ||
| 7 | /**/ | ||
| 8 | +#if 0 | ||
| 9 | #include <libgnomevfs/gnome-vfs.h> | ||
| 10 | +#endif | ||
| 11 | #include <libedataserver/e-url.h> | ||
| 12 | #include <libedataserver/e-source.h> | ||
| 13 | #include <libedataserver/e-data-server-module.h> | ||
| 14 | @@ -403,10 +405,12 @@ | ||
| 15 | |||
| 16 | loop = g_main_loop_new (NULL, FALSE); | ||
| 17 | |||
| 18 | +#if 0 | ||
| 19 | if (!gnome_vfs_init ()) { | ||
| 20 | g_error ("Failed to initialise gnome-vfs"); | ||
| 21 | } | ||
| 22 | - | ||
| 23 | +#endif | ||
| 24 | + | ||
| 25 | g_printerr ("Launching EDataCalFactory\n"); | ||
| 26 | |||
| 27 | /* Obtain a connection to the session bus */ | ||
| 28 | diff -urNd ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in trunk/configure.in | ||
| 29 | --- ../eds-dbus-1.4.0cvs20051004-r7/trunk/configure.in 2005-10-04 19:14:49.000000000 +0100 | ||
| 30 | +++ trunk/configure.in 2005-10-04 19:12:07.000000000 +0100 | ||
| 31 | @@ -1203,7 +1203,7 @@ | ||
| 32 | |||
| 33 | dnl --- evolution-calendar flags | ||
| 34 | |||
| 35 | -EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1" | ||
| 36 | +EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1" | ||
| 37 | |||
| 38 | EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) | ||
| 39 | 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 @@ | |||
| 1 | --- trunk/calendar/libecal-dbus/libecal.pc.in.old 2005-09-29 19:27:53.000000000 +0100 | ||
| 2 | +++ trunk/calendar/libecal-dbus/libecal.pc.in 2005-09-29 19:28:25.000000000 +0100 | ||
| 3 | @@ -11,6 +11,6 @@ | ||
| 4 | Name: libecal | ||
| 5 | Description: Client library for evolution calendars | ||
| 6 | Version: @VERSION@ | ||
| 7 | -Requires: gnome-vfs-2.0 libedataserver-1.2 dbus-glib-1 | ||
| 8 | +Requires: libedataserver-1.2 dbus-glib-1 | ||
| 9 | Libs: -L${libdir} -lecal-1.2 | ||
| 10 | 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" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ | 9 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ |
| 10 | file://no_libdb.patch;patch=1 \ | 10 | file://no_libdb.patch;patch=1 \ |
| 11 | file://no_gnomevfs.patch;patch=1 \ | ||
| 12 | file://no_gnomevfs2.patch;patch=1 \ | ||
| 13 | file://no_iconv_test.patch;patch=1 \ | 11 | file://no_iconv_test.patch;patch=1 \ |
| 14 | file://no_libedataserverui.patch;patch=1 \ | 12 | file://no_libedataserverui.patch;patch=1 \ |
| 15 | file://iconv-detect.h" | 13 | file://iconv-detect.h" |
