From 10daaff549d444b1141b829eec8fd2a5fca1d4db Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 8 Feb 2006 19:17:38 +0000
Subject: [PATCH] gnome-vfs-dbus: fix the svn version to make it build again

---
 packages/gnome/files/.mtn2git_empty            |  0
 .../gnome/{libbonobo => files}/gtk-doc.make    |  0
 .../gnome-vfs-dbus/glib-after-nameser.patch    | 18 ++++++++++++++++++
 packages/gnome/gnome-vfs-dbus_svn.bb           |  7 ++-----
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 packages/gnome/files/.mtn2git_empty
 rename packages/gnome/{libbonobo => files}/gtk-doc.make (100%)
 create mode 100644 packages/gnome/gnome-vfs-dbus/glib-after-nameser.patch

diff --git a/packages/gnome/files/.mtn2git_empty b/packages/gnome/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnome/libbonobo/gtk-doc.make b/packages/gnome/files/gtk-doc.make
similarity index 100%
rename from packages/gnome/libbonobo/gtk-doc.make
rename to 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_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index 2cde0552b9..dd41d2ce02 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 ./
 }
 
-- 
2.39.5