summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-30 23:49:21 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-30 23:49:21 +0000
commit602bbe66e0e821e33ca71785c1096a8b15efb967 (patch)
treee62d5c63551c84e9926cf08bb689a1f2346da811 /gnome-base/gvfs/files
parentFix underlinking, bug 370125 (diff)
downloadgentoo-2-602bbe66e0e821e33ca71785c1096a8b15efb967.tar.gz
gentoo-2-602bbe66e0e821e33ca71785c1096a8b15efb967.tar.bz2
gentoo-2-602bbe66e0e821e33ca71785c1096a8b15efb967.zip
Add patch from 1.11.x to fix building against >=glib-2.31 (bug #401539, thanks to Rolf S. Arvidson for reporting).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gvfs/files')
-rw-r--r--gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch b/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
new file mode 100644
index 000000000000..96663e6b04f8
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.10.1-unneeded-include.patch
@@ -0,0 +1,27 @@
+From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 13 Oct 2011 18:58:57 -0400
+Subject: [PATCH] Drop an unneeded include
+
+GLib recently became less forgiving about single includes
+like this.
+---
+ client/gvfsfusedaemon.c | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
+index b41e83b..a4ba32c 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.8.4
+