Bump to 3.0.2, from gnome overlay for GNOME 3

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

5 files changed, 205 insertions, 8 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index ed8a36f15522..df0125b7a987 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.380 2011/08/13 17:29:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.381 2011/08/15 12:26:09 nirbheek Exp $
+
+*nautilus-3.0.2 (15 Aug 2011)
+
+  15 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +nautilus-3.0.2.ebuild,
+  +files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch,
+  metadata.xml:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org> nautilus-2.32.2.1-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #369909
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b32c1a16e7ba..8fc5a5d1f199 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,16 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch 3222 RMD160 34dc109adfebd83c7e47a41690c804fbf1944396 SHA1 11b096e78f594005058b0f59a27d7692349d098b SHA256 d053fb1094995c26c0fa6ac0c368ad14154984db3c73e5ce72607202ff4bb0a8
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
+DIST nautilus-3.0.2.tar.bz2 5636620 RMD160 f133abc4934e6fec0e2a2688ba5a212e923279a6 SHA1 f2a926132a8f6c21be1a0c931588b7fb526ea04a SHA256 6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22
 EBUILD nautilus-2.32.2.1-r1.ebuild 2237 RMD160 f17abe2207cf76e49f1dc61ced3aaa4cc425b4ae SHA1 8fe3d032148add0f7be8f40c45b555f51ee0e0e3 SHA256 2077a46450a2fbe4cba3314a3e0b875aa9afa318ee135c93c33720d571a178fa
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
-MISC ChangeLog 56303 RMD160 3287cdfd4baf6caffa10be87ee330fa63a878656 SHA1 6e3ed8dd8b7b1809d075c56e171a24f3fb576fbd SHA256 75fe256087c877a39ddd9262a77e7223d26e08a86ebed22757718d07b1b51842
-MISC metadata.xml 274 RMD160 4a3e5603446a099b3e704fccbc8ccbd78a2660a1 SHA1 4215e0c0bb615596928a5a5fd7ec06b588d2b4b3 SHA256 d0e640b1d069f6546748707f63dc6c709546026b09ab863b26c77c041185002e
+EBUILD nautilus-3.0.2.ebuild 2449 RMD160 de6a85e7a6de5f97b7c40751ce74b4ec5058fe99 SHA1 f6a7d68cd11f572cdf9534564dcb463558529efa SHA256 033856cc77bf066ebc18a2cf10cfffdc593aa3770b55f84249fcbf21b9c1d7ec
+MISC ChangeLog 56549 RMD160 366eb6a19d4d099a8589dd9fd17c42afb8313135 SHA1 f20a76f0af1118b1724d0cdb1bfa7d130d504526 SHA256 eb45cfe9ec87c836aaef330e2b6a4aa7a55bd4d1dc41363ed0f167e6de239383
+MISC metadata.xml 382 RMD160 1ebea648fbaed962049cb7f95f8c12dc530afc31 SHA1 f651d184f369b1aface2ab9a7d2ba13869ae0453 SHA256 c7243f8999b72a07e46dedc00e9e2568b30ab261971b9eb78a85595f4e2b07a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5GtH4ACgkQuQc30/atMkAyogCfTsGzGEygSnaExZwtvklWMDkB
-PxoAn1yud8kZ2sjRXcOOE7cvCg7lyvCo
-=DBkI
+iQIcBAEBAgAGBQJOSRBtAAoJEO/kOhxWD91k+vUP/16VgKb//iGMXSoertqnREuy
+yNh4TzwuWqzGL+bdV44Tvlj3eoWfjGTk+8tTHCrgPH0E5zSbaqAUPHbmF7LihHLn
+0d1+4xWedXuKV4lvyzYAIDa2Zk5u+BQcaly1VtSBIHTE9vaQHbxIVSdBXQXLqgvr
+A0MJ4pNN7DEiI1eIXVIvXtRpUs1jCmvmposRa/QBOTgBM8ek9QlwtODeK7TBVfeq
+tN3eBqW7+EQyDwe1EFrpGGhfNnIDRrxc1MQq67DEqiWpJK51C4OmLODnGgUbGnJR
+feHEo4TusJTfDhtn9Flkn64BhpOwXmcQzZATVAx/uaBKbvqoxqi498qwtR589S3y
+cCzCVsQETf4+BtSg/NCAg+4yYIQOHpYMRukSSG6Og/1TmXDNGgmPSMaU4pTA9j+X
+ArQgiiuFC6PlHdFl5A6Sc5tPA06o6v8uyuGix8F2BuIWxFs67YWa1Z8NdIVTnbZu
+JA/aobTBh55kQZA0xFTAqd+hmk1JDSfMIit8iVOOedTBa/d3kE4Fe3lSz/KMvIAZ
+MAnQxhfa1H/2BNXWcZlMhFIjby0uglphoWFC1gtyQsgVePUXqftyg7I86QE3LTPZ
+HDBSDEoXroBRnUjyvYdBHIW+Ty1zcGi7v2WnlPkr3JqwRyS27aD61WfW6uoWyc5E
+/xCOefQoaH4TY31WAb0A
+=ikqz
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
new file mode 100644
index 000000000000..82781f7ed5e7
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
@@ -0,0 +1,88 @@
+From a37ecf869f4772b1ea3b578b687b5b83dd4bd067 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 27 May 2011 01:10:24 -0400
+Subject: [PATCH] Prevent segfault in gtk_icon_info_load_symbolic when icon is not found (gnome bug 651209)
+
+Users of Gentoo and Fedora have reported segfaults in nautilus-3.0.x
+in gtk_icon_info_load_symbolic (see Gentoo bug 365779, Fedora bug
+690357). One of them was helpful enough to post a backtrace with
+debugging information: https://bugzilla.redhat.com/attachment.cgi?id=489928
+
+The backtrace shows that the crash occurs because we are passing a
+NULL icon_info to gtk_icon_info_load_symbolic in lookup_and_color_symbolic_find
+in nautilus-search-bar.c; indeed, icon_info will be NULL if
+gtk_icon_theme_lookup_icon fails to find an icon.
+
+An identical problem exists in get_eject_icon in nautilus-places-sidebar.c,
+where gtk_icon_info_load_symbolic_for_context and
+gtk_icon_theme_lookup_by_gicon are used.
+
+The solution is to check for the NULL icon_info, and return a
+NULL GdkPixbuf. Note that returning a NULL from
+lookup_and_color_symbolic_find and get_eject_icon is
+safe: in both cases, the return value is only used in functions
+that can safely deal with a NULL.
+---
+ src/nautilus-places-sidebar.c |   11 ++++++-----
+ src/nautilus-search-bar.c     |    9 +++++----
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index aa08f14..de53cd1 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -214,7 +214,7 @@ static GdkPixbuf *
+ get_eject_icon (NautilusPlacesSidebar *sidebar,
+ 		gboolean highlighted)
+ {
+-	GdkPixbuf *eject;
++	GdkPixbuf *eject = NULL;
+ 	GtkIconInfo *icon_info;
+ 	GIcon *icon;
+ 	int icon_size;
+@@ -227,10 +227,11 @@ get_eject_icon (NautilusPlacesSidebar *sidebar,
+ 	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, icon_size, 0);
+ 
+ 	style = gtk_widget_get_style_context (GTK_WIDGET (sidebar));
+-	eject = gtk_icon_info_load_symbolic_for_context (icon_info,
+-							 style,
+-							 NULL,
+-							 NULL);
++	if (icon_info != NULL)
++		eject = gtk_icon_info_load_symbolic_for_context (icon_info,
++								 style,
++								 NULL,
++								 NULL);
+ 
+ 	if (highlighted) {
+ 		GdkPixbuf *high;
+diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
+index 6148807..17412d9 100644
+--- a/src/nautilus-search-bar.c
++++ b/src/nautilus-search-bar.c
+@@ -160,7 +160,7 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
+ {
+ 	GtkIconInfo *icon_info;
+ 	GdkRGBA color;
+-	GdkPixbuf *icon;
++	GdkPixbuf *icon = NULL;
+ 	GtkStyleContext *context;
+ 
+ 	context = gtk_widget_get_style_context (GTK_WIDGET (bar));
+@@ -172,9 +172,10 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
+ 						"edit-find-symbolic",
+ 						nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU),
+ 						GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+-	icon = gtk_icon_info_load_symbolic (icon_info, &color,
+-					    NULL, NULL, NULL,
+-					    NULL, NULL);
++	if (icon_info != NULL)
++		icon = gtk_icon_info_load_symbolic (icon_info, &color,
++						    NULL, NULL, NULL,
++						    NULL, NULL);
+ 
+ 	gtk_style_context_restore (context);
+ 
+-- 
+1.7.5.rc3
+
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 492a4f76bce6..e13a63fed6b0 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -3,8 +3,9 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use
-		<pkg>dev-libs/gobject-introspection</pkg> for
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>
+	<flag name="sendto">Enable the nautilus-sendto extension to send files to
+		various locations/devices</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-3.0.2.ebuild b/gnome-base/nautilus/nautilus-3.0.2.ebuild
new file mode 100644
index 000000000000..2fe3adfbfa5b
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.0.2.ebuild,v 1.1 2011/08/15 12:26:09 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Nautilus"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc exif gnome +introspection sendto xmp"
+
+COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.0.8:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3.0.0:3
+
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	xmp? ( >=media-libs/exempi-2.1.0 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	x11-proto/xproto
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	sendto? ( !gnome-extra/nautilus-sendto )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+PDEPEND="gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	>=gnome-base/gvfs-0.1.2"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-update-mimedb
+		--disable-packagekit
+		$(use_enable exif libexif)
+		$(use_enable introspection)
+		$(use_enable sendto nst-extension)
+		$(use_enable xmp)"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+}
+
+src_prepare() {
+	# Gentoo bug #365779 + https://bugzilla.gnome.org/show_bug.cgi?id=651209
+	epatch "${FILESDIR}/${PN}-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch"
+
+	gnome2_src_prepare
+
+	# Remove crazy CFLAGS
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
+		|| die "sed 1 failed"
+}
+
+src_test() {
+	addpredict "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}