Fix compatibility with gtk+-2.14, bug 238734

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

4 files changed, 41 insertions, 3 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index e4114259aae6..34e75eb411de 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.276 2008/09/25 14:27:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.277 2008/09/28 09:09:58 leio Exp $
+
+  28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/nautilus-2.22.5.1-fix-stat-include.patch, nautilus-2.22.5.1.ebuild,
+  nautilus-2.22.5.1-r1.ebuild:
+  Fix compatibility with gtk+-2.14, bug 238734
 
   25 Sep 2008; Jeroen Roovers <jer@gentoo.org> nautilus-2.22.5.1.ebuild:
   Stable for HPPA (bug #236971).
diff --git a/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch b/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch
new file mode 100644
index 000000000000..362b15aea20c
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.5.1-fix-stat-include.patch
@@ -0,0 +1,27 @@
+Fixed on trunk with
+http://svn.gnome.org/viewvc/nautilus/trunk/libnautilus-private/nautilus-emblem-utils.c?r1=14319&r2=14357&view=patch
+and
+http://svn.gnome.org/viewvc/nautilus/trunk/libnautilus-private/nautilus-file.c?r1=14318&r2=14319
+so shouldn't be necessary for nautilus-2.24 onwards
+
+--- libnautilus-private/nautilus-emblem-utils.c.orig	2008-09-28 11:40:05.284668861 +0300
++++ libnautilus-private/nautilus-emblem-utils.c	2008-09-28 11:40:12.617466465 +0300
+@@ -30,6 +30,8 @@
+ #include <string.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <sys/stat.h>
++
+ #include "nautilus-file.h"
+ #include <eel/eel-glib-extensions.h>
+ #include <eel/eel-gdk-pixbuf-extensions.h>
+--- libnautilus-private/nautilus-file.c.orig	2008-09-28 11:49:33.990743377 +0300
++++ libnautilus-private/nautilus-file.c	2008-09-28 11:50:20.917404516 +0300
+@@ -56,6 +56,7 @@
+ #include <grp.h>
+ #include <gtk/gtksignal.h>
+ #include <glib/gi18n.h>
++#include <glib/gstdio.h>
+ #include <gio/gio.h>
+ #include <glib/gurifuncs.h>
+ #include <libgnome/gnome-macros.h>
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
index 0743aa7e74d4..60edd2a3a46c 100644
--- a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.2 2008/07/28 21:09:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild,v 1.3 2008/09/28 09:09:59 leio Exp $
 
 inherit virtualx eutils gnome2
 
@@ -53,6 +53,9 @@ src_unpack() {
 
 	# "Ask what to do" by default, bug #229725
 	epatch "${FILESDIR}/${PN}-2.22.5-ask-what-to-do.patch"
+
+	# Build fix
+	epatch "${FILESDIR}/${P}-fix-stat-include.patch"
 }
 
 src_test() {
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
index c028aed7e49b..3aae04deed6e 100644
--- a/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1.ebuild,v 1.8 2008/09/25 14:27:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1.ebuild,v 1.9 2008/09/28 09:09:59 leio Exp $
 
 inherit virtualx eutils gnome2
 
@@ -52,6 +52,9 @@ src_unpack() {
 
 	# "Ask what to do" by default, bug #229725
 	epatch "${FILESDIR}/${PN}-2.22.5-ask-what-to-do.patch"
+
+	# Compatibility with gtk+-2.14
+	epatch "${FILESDIR}/${P}-fix-stat-include.patch"
 }
 
 src_test() {