# 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.385 2011/11/02 16:51:46 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.386 2011/11/25 06:17:44 tetromino Exp $
+
+ 25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -nautilus-3.0.2.ebuild,
+ -files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch:
+ Drop old.
*nautilus-3.2.1 (02 Nov 2011)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-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
DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbff7 SHA1 246c6ae0539dc111d755727ad4cb12d8df7bd322 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
EBUILD nautilus-2.32.2.1-r1.ebuild 2262 RMD160 b6e47de5db54d0d6f8a5c5ff5199b5ab0ce1221b SHA1 8e46537dd0e7582ed95c6149f6f71c0f893bf38a SHA256 2f5877b556945f51b4bfc025d099b17a4cd5b8c4e747b99d54751ed445705c84
EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
-EBUILD nautilus-3.0.2.ebuild 2464 RMD160 51291b11286faf352a3a667801e5670deb94ca55 SHA1 c1381b03bda3a372e677c77d472ab574bf7413bd SHA256 26d328dfa3af2d57d5b89e3878309bb8c9281579bcb8767c96a38a1fe0e5628f
EBUILD nautilus-3.2.1.ebuild 2836 RMD160 fe5a3f572d4e28ce3587d2072e759e37d16d1bec SHA1 134ec9d9a58539f767891bb4a8352248ef9e5062 SHA256 8cfb351e57ad832238970150e6f42e9989095a43006b4533e3db07884f231e80
-MISC ChangeLog 57439 RMD160 cc709d3146b501076131f2f44f652688861b1a83 SHA1 046323219472ec2a7c3df8c969a4e67d795b43b5 SHA256 f034d1f245add06a41d338324390e64b275fe52c87555ff5f40057e4c58d4cba
+MISC ChangeLog 57608 RMD160 ddf356e7835fe057d2adb3e225d020befcc7e1a1 SHA1 59ed005bdee7cbd79fd20f48fa4b886d2b8f549a SHA256 e92b98d9d784c61f79bdd0332132c344cceff890434cc1548d532ef17817bd29
MISC metadata.xml 667 RMD160 4905458681c088bef4b030ee1a963a71b9cb53bd SHA1 fa3a39a43c3e54058f3996d30fa93cd8d03897aa SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6xdScACgkQdjK8w9WeBnDJ9AD9EynCMG6Jrwl/D1KZdBJl3Q0r
-0bID0PvEpTK3XwWksLEA/18Iy2xrxOgl03UbJGSmajk2laY2jiVqVyNNnYsTn4hS
-=R/fK
+iF4EAREIAAYFAk7PMw0ACgkQdjK8w9WeBnAo8QD/cX4Ucx2KYEABUy1+dXuu0ZXk
+3Lzo9yL4FxJFJRmABrwA/36goy8jFk/hSAHrFmDLTznbBxg2YDEmKXlQuUhem0DB
+=Noa4
-----END PGP SIGNATURE-----
+++ /dev/null
-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
-
+++ /dev/null
-# 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.2 2011/09/22 15:43:04 pacho 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/dconf
- 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"
-}
projects / gentoo.git / commitdiff