summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-05-14 16:03:27 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-05-16 07:29:16 +0200
commit29da3f431f1a2fa27e5117bc8a21c9e5d61b54eb (patch)
tree5c2d57088f44d1ca55bd7079a9c4305a9ed8f779 /meta-gnome
parent984fa94e2b75d1665077953fa3c9c6e74e8fc328 (diff)
downloadmeta-openembedded-29da3f431f1a2fa27e5117bc8a21c9e5d61b54eb.tar.gz
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@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gvfs/files/0001-gvfsfusedaemon.c-fix-glib-build.patch31
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs.inc3
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 000000000..3db44a854
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gvfs/files/0001-gvfsfusedaemon.c-fix-glib-build.patch
@@ -0,0 +1,31 @@
1From c339eaaa514b8edcfe8de5c9610b8f2591ec221a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 14 May 2012 17:36:37 +0200
4Subject: [PATCH] gvfsfusedaemon.c: fix glib build
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstream-status: Applied but we can not use it because newer versions depend
9on gnome-disk-utiltity >= V3.02 which depends on gtk+ V3
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12---
13 client/gvfsfusedaemon.c | 2 --
14 1 files changed, 0 insertions(+), 2 deletions(-)
15
16diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
17index bc3090d..f2e708e 100644
18--- a/client/gvfsfusedaemon.c
19+++ b/client/gvfsfusedaemon.c
20@@ -41,8 +41,6 @@
21 #include <glib/gprintf.h>
22 #include <gio/gio.h>
23
24-#include <glib/gurifuncs.h>
25-
26 /* stuff from common/ */
27 #include <gdaemonmount.h>
28 #include <gvfsdaemonprotocol.h>
29--
301.7.6.5
31
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
index b6a0526f4..903a8ba28 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"
4 4
5inherit gnome 5inherit gnome
6 6
7INC_PR = "r6" 7INC_PR = "r7"
8 8
9SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562" 9SRC_URI[archive.md5sum] = "402f94b187b197b403d25c85caeb9562"
10SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345" 10SRC_URI[archive.sha256sum] = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"
11SRC_URI += "file://0001-gvfsfusedaemon.c-fix-glib-build.patch"
11 12
12EXTRA_OECONF = "--disable-samba \ 13EXTRA_OECONF = "--disable-samba \
13 --with-samba-includes=${STAGING_INCDIR} \ 14 --with-samba-includes=${STAGING_INCDIR} \