[oe-commits] Andreas Müller : gvfs: fix build

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 29da3f431f1a2fa27e5117bc8a21c9e5d61b54eb
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=29da3f431f1a2fa27e5117bc8a21c9e5d61b54eb

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Mon May 14 16:03:27 2012 +0000

gvfs: fix build

Error message was:
| In file included from gvfsfusedaemon.c:44:0:
| /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/glib-2.0/glib/gurifuncs.h:24:2: error: #error "Only <glib.h> can be included directly."

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../0001-gvfsfusedaemon.c-fix-glib-build.patch     |   31 ++++++++++++++++++++
 meta-gnome/recipes-gnome/gvfs/gvfs.inc             |    3 +-
 2 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/meta-gnome/recipes-gnome/gvfs/files/0001-gvfsfusedaemon.c-fix-glib-build.patch b/meta-gnome/recipes-gnome/gvfs/files/0001-gvfsfusedaemon.c-fix-glib-build.patch
new file mode 100644
index 0000000..3db44a8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0001-gvfsfusedaemon.c-fix-glib-build.patch
@@ -0,0 +1,31 @@
+From c339eaaa514b8edcfe8de5c9610b8f2591ec221a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at googlemail.com>
+Date: Mon, 14 May 2012 17:36:37 +0200
+Subject: [PATCH] gvfsfusedaemon.c: fix glib build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Upstream-status: Applied but we can not use it because newer versions depend
+on gnome-disk-utiltity >= V3.02 which depends on gtk+ V3
+
+Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
+---
+ client/gvfsfusedaemon.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
+index bc3090d..f2e708e 100644
+--- a/client/gvfsfusedaemon.c
++++ b/client/gvfsfusedaemon.c
+@@ -41,8 +41,6 @@
+ #include <glib/gprintf.h>
+ #include <gio/gio.h>
+ 
+-#include <glib/gurifuncs.h>
+-
+ /* stuff from common/ */
+ #include <gdaemonmount.h>
+ #include <gvfsdaemonprotocol.h>
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
index b6a0526..903a8ba 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
@@ -4,10 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
 inherit gnome
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
 SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
+SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.patch"
 
 EXTRA_OECONF = "--disable-samba \
                 --with-samba-includes=${STAGING_INCDIR} \