gnome-vfs: fix build with glib 2.36

(From meta-openembedded rev: ddff7e8732aad46f56921d8194d03f842cc74d7b)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
new file mode 100644 (file)
index 0000000..d8f7e40
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
@@ -0,0 +1,42 @@
+From 536e9b57cada4a9f92e073fdf01cdf1def435b6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 7 May 2013 14:56:06 +0200
+Subject: [PATCH] multiple Makefile.am: remove -DG_DISABLE_DEPRECATED to fix
+ build with glib-2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ daemon/Makefile.am      |    1 -
+ libgnomevfs/Makefile.am |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index ca57467..040484f 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -8,7 +8,6 @@ INCLUDES= \
+       -D_LARGEFILE64_SOURCE                   \
+       -D_POSIX_PTHREAD_SEMANTICS              \
+       -D_REENTRANT                            \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+       -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+       -DGNOME_VFS_LIBDIR=\"$(libdir)\"        \
+diff --git a/libgnomevfs/Makefile.am b/libgnomevfs/Makefile.am
+index 69a02e0..5d7d759 100644
+--- a/libgnomevfs/Makefile.am
++++ b/libgnomevfs/Makefile.am
+@@ -19,7 +19,6 @@ INCLUDES =                                   \
+       -D_LARGEFILE64_SOURCE                   \
+       -D_POSIX_PTHREAD_SEMANTICS              \
+       -D_REENTRANT                            \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+       -DGNOME_VFS_BINDIR=\"$(bindir)\"        \
+       -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+-- 
+1.7.6.5
+

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 78cd1d6..57bbc13 100644 (file)
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -13,15 +13,18 @@ DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
 
-SRC_URI += "file://gconftool-lossage.patch \
-        file://gnome-vfs-no-kerberos.patch;striplevel=0"
+SRC_URI += " \
+    file://gconftool-lossage.patch \
+    file://gnome-vfs-no-kerberos.patch;striplevel=0 \
+    file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
+"
 
 SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
 SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"