Fix crashes with gtk+-2.12 in browser mode, bug #193536

(Portage version: 2.1.3.9)

4 files changed, 114 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 6710f80939e6..247fc8632058 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.237 2007/09/25 04:18:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.238 2007/09/25 10:47:04 leio Exp $
+
+*nautilus-2.18.3-r1 (25 Sep 2007)
+
+  25 Sep 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/nautilus-2.18.3-gtk2.12-compatibility.patch,
+  +nautilus-2.18.3-r1.ebuild:
+  Fix crashes with gtk+-2.12 in browser mode, bug #193536
 
   25 Sep 2007; Jeroen Roovers <jer@gentoo.org> nautilus-2.18.3.ebuild:
   Stable for HPPA (bug #193339).
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1 b/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1
new file mode 100644
index 000000000000..99679ccc7dbe
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1
@@ -0,0 +1,3 @@
+MD5 e027b4e1a925122ef3e7f54323cc3c44 nautilus-2.18.3.tar.bz2 4331118
+RMD160 2069e1e9bb00c1ef6d942b114f8acda4776a06b0 nautilus-2.18.3.tar.bz2 4331118
+SHA256 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16 nautilus-2.18.3.tar.bz2 4331118
diff --git a/gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch b/gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch
new file mode 100644
index 000000000000..9e89edf8fe51
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch
@@ -0,0 +1,25 @@
+From http://svn.gnome.org/viewcvs/nautilus?view=revision&revision=13002 to fix
+http://bugzilla.gnome.org/show_bug.cgi?id=459221
+and our bug http://bugs.gentoo.org/show_bug.cgi?id=193536
+
+ChangeLog entry:
+* src/nautilus-navigation-window.c:
+(view_as_menu_switch_views_callback):
+Handle the fact that the gtk+ 2.11.x combobox emits the
+changed signal on removing the active entry without crash.
+
+--- trunk/src/nautilus-navigation-window.c	2007/07/18 12:24:05	13001
++++ trunk/src/nautilus-navigation-window.c	2007/07/18 22:07:07	13002
+@@ -854,8 +854,10 @@
+ 	g_assert (NAUTILUS_IS_WINDOW (window));
+ 
+ 	active = gtk_combo_box_get_active (combo_box);
+-	
+-	if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))  ) {
++
++	if (active < 0) {
++		return;
++	} else if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))) {
+ 		activate_nth_short_list_item (window, active);
+ 	} else {
+ 		activate_extra_viewer (window);
diff --git a/gnome-base/nautilus/nautilus-2.18.3-r1.ebuild b/gnome-base/nautilus/nautilus-2.18.3-r1.ebuild
new file mode 100644
index 000000000000..9b468bacdf96
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.18.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.18.3-r1.ebuild,v 1.1 2007/09/25 10:47:04 leio Exp $
+
+inherit virtualx eutils gnome2
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle gnome"
+# tracker cups flac gstreamer mad ogg vorbis
+
+RDEPEND=">=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.15.92
+	>=media-sound/esound-0.2.27
+	>=dev-libs/glib-2.6
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.14.0
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.15
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2
+	beagle? ( >=app-misc/beagle-0.0.12 )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xproto
+	virtual/eject"
+#	x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) )
+#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.8
+#		>=media-libs/gst-plugins-0.8
+#		>=media-plugins/gst-plugins-gnomevfs-0.8
+#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+	# Fixes crashes in _browser mode_ folder opening with gtk+-2.12
+	epatch "${FILESDIR}/${P}-gtk2.12-compatibility.patch"
+}
+
+pkg_setup() {
+	G2CONF="--disable-update-mimedb $(use_enable beagle) --disable-tracker"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	Xmake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "nautilus can use mpg123 (media-sound/mpg123 or media-sound/mpg321)"
+	elog "to preview mp3 files, and ogg123 (media-sound/vorbis-tools) to"
+	elog "preview ogg files.  If you want such previews, emerge those packages"
+}