Add patch from 1.11.x to fix building against >=glib-2.31 (bug #401539, thanks to Rolf S. Arvidson for reporting).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 45 insertions, 9 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 4c116c01f82e..a8d4e9dbc530 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.165 2012/01/18 20:39:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.166 2012/01/30 23:49:21 tetromino Exp $
+
+  30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
+  +files/gvfs-1.10.1-unneeded-include.patch:
+  Add patch from 1.11.x to fix building against >=glib-2.31 (bug #401539,
+  thanks to Rolf S. Arvidson for reporting).
 
   18 Jan 2012; Markus Meier <maekke@gentoo.org> gvfs-1.10.1.ebuild:
   arm stable, bug #393007
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index e8c9b9b8d536..0c9fefe8d6f6 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gvfs-1.10.1-unneeded-include.patch 706 RMD160 e6e911fb43aa24201422f3ced7d03d753ce7bc99 SHA1 b180b53b35b8191c0a75795ab40ffec32d4c78ec SHA256 7271536185ad468c39474b8eea387af7038a974c60964b5d8d4f6bac0cc96969
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 AUX gvfs-1.6.7-fix-renaming.patch 1484 RMD160 a35255f2e926ed44f41bf1ff14dbc1b50925113d SHA1 880f387bb127ae7c0346ee6114a7bd127e68c8ee SHA256 af564f4c555b1052fd88bf14798abd095920765f356549a40c56f6b791aaa5af
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.6.7.tar.bz2 1404372 RMD160 e833fdbc9dc503cdde8e0ab5a7a8fa5403ec1aa1 SHA1 285a810772dce8b37289cbe0aaab8354f2b6717a SHA256 fe5f6181eac14d5147794389bf57717226a15ddf8283631b434c2d9ec120d659
 DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
-EBUILD gvfs-1.10.1.ebuild 3218 RMD160 30e2e2d44b2b582ec32d377c867f8ae97f79c8a1 SHA1 1288a4c95d75e77caac4378fe751c22f87c76b8b SHA256 04c18dd592b9e130a7a032a94a01e23bd7afc5eb097ac9e06a73a90f8a51db5b
+EBUILD gvfs-1.10.1.ebuild 3335 RMD160 379cd7eb42a0bc092fc2961c59fe42becac8e74c SHA1 7a7238851ae78c9d1f42f661f45e5329b4a6b636 SHA256 f87a336cc604fadf8756349cef3a987ec0f94d4e4739029eb183417e8ceb521f
 EBUILD gvfs-1.6.7-r1.ebuild 3430 RMD160 d31f05df83ae8212767e5898bcaa87812bb871e0 SHA1 3e66a3ccc5d434e1e3d46522f14ca022486f875f SHA256 e0143c8ba2d0a580460561a05a7f230fe4de8374ed79d28a445b7fe83ba95444
-MISC ChangeLog 22825 RMD160 183e2a7969f245851c3c78859241aecaf87e0273 SHA1 fbfe77dc493fabbf3fc5e9a8c58dc88d7e77851c SHA256 c3e07893a9ab1abc610d96130e35c25ff989174112b73d758aa38762ba4b4cab
+MISC ChangeLog 23072 RMD160 cbedbb8eb0ea9f3efb873fb9f5983e275c10dc14 SHA1 b949f93aa18d5129d5b6e497e6b32e77d2eaac0f SHA256 1072a42042884100eca4146d4069ee9de34b8b9d4d8bff2dffd189afec801c59
 MISC metadata.xml 1365 RMD160 91bbd0b4e8e676a0a8ac3302fbfaa83d0c905aa0 SHA1 13d13a60eabd3dde5139d7fa3cd0a3ae7a88a720 SHA256 8bdcd7b16c5ddff7b3f933412a06d4dd840e5ff33b00ee4283a7ec75d974f38f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8XLm8ACgkQkKaRLQcq0GKC7wCeNh2GkAUHmyim6URRm5/oJ83t
-29UAniY/X3GtV1BXMNoNoMgc1kuFvdUt
-=dBIi
+iF4EAREIAAYFAk8nLIYACgkQdjK8w9WeBnD27wD/QEjqOKi+U8uktNrPr9vhpRM3
+FVpfwnlX2P5GOovW8jgBALdeLERWOLIo89sCQ5KZ/vdGj+J2AmSFiWwnNFBaDM5K
+=cEji
 -----END PGP SIGNATURE-----
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
+
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index 54517b3387f5..4692cc259527 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.8 2012/01/18 20:39:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.9 2012/01/30 23:49:21 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -87,6 +87,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Patch from 1.11 for building against glib-2.31, bug #401539
+	epatch "${FILESDIR}/${P}-unneeded-include.patch"
+
 	# Conditional patching purely to avoid eautoreconf
 	use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch