diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-02-08 19:46:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-08 19:46:44 +0000 |
| commit | f58b9f0b800a7862e2e58692fa8e249fa1dcbc81 (patch) | |
| tree | 0091dc08b6f0cb5cdc120d4b2f1e846fe87a6846 /packages | |
| parent | a11765c6d7508a96a2974b6be41c47f2124b0267 (diff) | |
| parent | be87bc57c9ac17fc6ce6ef5cc5a70a63491a6baf (diff) | |
merge of 65ff3c29b2d11109da1f8a71bdfcc1dfe9819b3d
and 9e50203982dff971247712f595aa258181bfff0f
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gnome/files/gtk-doc.make (renamed from packages/gnome/libbonobo/gtk-doc.make) | 0 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch | 18 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs-dbus_2.8.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/gnome/gnome-vfs-dbus_svn.bb | 9 |
5 files changed, 22 insertions, 7 deletions
diff --git a/packages/gnome/files/.mtn2git_empty b/packages/gnome/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/files/.mtn2git_empty diff --git a/packages/gnome/libbonobo/gtk-doc.make b/packages/gnome/files/gtk-doc.make index c319e7ad7c..c319e7ad7c 100644 --- a/packages/gnome/libbonobo/gtk-doc.make +++ b/packages/gnome/files/gtk-doc.make diff --git a/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch new file mode 100644 index 0000000000..87bf7c3939 --- /dev/null +++ b/packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch @@ -0,0 +1,18 @@ +--- trunk/libgnomevfs/gnome-vfs-resolve.c.orig 2006-02-08 19:18:43.000000000 +0100 ++++ trunk/libgnomevfs/gnome-vfs-resolve.c 2006-02-08 19:21:42.000000000 +0100 +@@ -23,7 +23,6 @@ + + #include <errno.h> + #include <string.h> +-#include <glib.h> + #ifndef G_OS_WIN32 + /* Keep <sys/types.h> above the network includes for FreeBSD. */ + #include <sys/types.h> +@@ -48,6 +47,7 @@ + #define RELOAD_TIMEVAL 2 + #endif + ++#include <glib.h> + #include <glib-object.h> + + #include <libgnomevfs/gnome-vfs-resolve.h> diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index 4f2a861eb2..5717115ebc 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -81,7 +81,7 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } -PACKAGES_DYNAMIC = "gnome=vfs-plugin-*" +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb index 2cde0552b9..f248a74faf 100644 --- a/packages/gnome/gnome-vfs-dbus_svn.bb +++ b/packages/gnome/gnome-vfs-dbus_svn.bb @@ -15,9 +15,8 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=http \ file://gssapi.patch;patch=1;pnum=1 \ file://gconftool-lossage.patch;patch=1;pnum=1 \ - file://werror_compile.patch;patch=1;pnum=1 \ - file://gtk-doc.m4 \ - file://gtk-doc.make" + file://gtk-doc.make \ + file://glib-after-nameser.patch;patch=1;pnum=1" EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc" S = "${WORKDIR}/trunk" @@ -77,8 +76,6 @@ gnome-vfs-mime.h \ gnome-vfs-socket-buffer.h" do_configure_prepend() { - mkdir -p m4 - install ${WORKDIR}/gtk-doc.m4 ./m4/ install ${WORKDIR}/gtk-doc.make ./ } @@ -94,7 +91,7 @@ do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install } -PACKAGES_DYNAMIC = "gnome=vfs-plugin-*" +PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" python populate_packages_prepend () { print bb.data.getVar('FILES_gnome-vfs', d, 1) |