Update w/ patch to allow nautilus to build with mozilla-1.0_rc1. Resolves bug #2082

4 files changed, 145 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 2b775919454d..c3026c2881b6 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.5 2002/03/24 08:10:26 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.6 2002/04/25 06:08:40 mkennedy Exp $
+
+*nautilus-1.0.6-r7 (24 Apr 2002)
+
+  24 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  nautilus-1.0.6-r7.ebuild, files/nautilus-1.0.6-mozilla-1.0_rc1.diff,
+  files/digest-nautilus-1.0.6-r7, ChangeLog :
+
+  This patch to fix http://bugs.gentoo.org/show_bug.cgi?id=2082 (taken
+  from
+  http://lists.eazel.com/pipermail/nautilus-list/2002-April/008473.html)
+  Credit to Kaoru Fukui <k_fukui@highway.ne.jp>. This should allow
+  nautilus to build against mozilla-1.0_rc1.
+
 
 *nautilus-1.0.6-r6 (22 Mar 2002)
 
diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7 b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7
new file mode 100644
index 000000000000..618f369df464
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-1.0.6-r7
@@ -0,0 +1 @@
+MD5 436283056c100bcbd14098a5342e2868 nautilus-1.0.6.tar.gz 11481232
diff --git a/gnome-base/nautilus/files/nautilus-1.0.6-mozilla-1.0_rc1.diff b/gnome-base/nautilus/files/nautilus-1.0.6-mozilla-1.0_rc1.diff
new file mode 100644
index 000000000000..a956c2ecfbb9
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-1.0.6-mozilla-1.0_rc1.diff
@@ -0,0 +1,25 @@
+diff -urN base/components/mozilla/mozilla-events.cpp fixed/components/mozilla/mozilla-events.cpp
+--- base/components/mozilla/mozilla-events.cpp	Tue Oct 16 01:25:17 2001
++++ fixed/components/mozilla/mozilla-events.cpp	Tue Apr 23 02:44:30 2002
+@@ -355,7 +355,7 @@
+ 
+ /* Why can't I use GetElementsByTagName?  I couldn't get it to work for me */
+ static nsIDOMNode *
+-get_anchor_named (nsIDOMNode *top_node, const nsAReadableString& aName)
++get_anchor_named (nsIDOMNode *top_node, const nsAString &aName)
+ {
+ 	nsresult rv;
+ 	nsAutoString src_string;
+@@ -565,7 +565,7 @@
+ 
+ /* Why can't I use GetElementsByTagName?  I couldn't get it to work for me */
+ static gboolean
+-find_node_named_with_src (nsIDOMNode *top_node, const nsAReadableString& aName, const nsAReadableString& uri)
++find_node_named_with_src (nsIDOMNode *top_node, const nsAString& aName, const nsAString& uri)
+ {
+ 	nsresult rv;
+ 	nsAutoString src_string;
+
+
+
+
diff --git a/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild b/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild
new file mode 100644
index 000000000000..7c72193be3c2
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# Updated by Sebastian Werner <sebastian@werner-productions.de>
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-1.0.6-r7.ebuild,v 1.1 2002/04/25 06:08:40 mkennedy Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="nautilus"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
+
+HOMEPAGE="http://www.gnome.org/"
+
+RDEPEND="mozilla? ( >=net-www/mozilla-0.9.5 )
+	>=app-admin/fam-oss-2.6.4
+	>=media-sound/cdparanoia-3.9.8
+	>=gnome-base/bonobo-1.0.9-r1
+	>=gnome-base/gnome-core-1.4.0.4-r1
+	>=gnome-base/libghttp-1.0.9-r1
+	>=gnome-base/gnome-vfs-1.0.3
+	>=gnome-base/librsvg-1.0.1
+	>=gnome-base/eel-1.0.2
+	>=gnome-extra/medusa-0.5.1-r1"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=app-text/scrollkeeper-0.2
+	>=dev-util/intltool-0.11"
+
+src_unpack() {
+
+	unpack ${P}.tar.gz
+
+	# The following is a temporary patch contributed by Naresh Donti
+	# to fix the 50 defunct copies of sh caused by hyperbola.  This patch
+	# will no longer be needed with a future version of scrollkeeper.
+	# see bug #566 for more information
+
+	patch -p0 < ${FILESDIR}/nautilus-1.0.6-hyperbola.diff
+
+	# This patch to fix http://bugs.gentoo.org/show_bug.cgi?id=2082
+	# (taken from
+	# http://lists.eazel.com/pipermail/nautilus-list/2002-April/008473.html)
+	# Credit to Kaoru Fukui <k_fukui@highway.ne.jp>. This is probably
+	# a temporary patch until the next nautilus.
+
+	cd ${S} ; patch -p1 < ${FILESDIR}/nautilus-1.0.6-mozilla-1.0_rc1.diff
+}
+
+src_compile() {                           
+	local myconf
+	
+	if [ -z "`use nls`" ]
+	then
+		myconf="${myconf} --disable-nls"
+		mkdir intl
+		touch intl/libgettext.h
+	fi
+
+	if [ "`use mozilla`" ]
+	then
+		MOZILLA=${MOZILLA_FIVE_HOME}
+		myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \
+				  --with-mozilla-include-place=$MOZILLA/include"
+
+		export MOZILLA_FIVE_HOME=$MOZILLA
+		export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
+	else
+		myconf="${myconf} --disable-mozilla-component"
+	fi
+
+	libtoolize --copy --force
+	aclocal
+	autoconf
+
+	CFLAGS="${CFLAGS} `gnome-config --cflags gdk_pixbuf`"
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man	\
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-eazel-services=0 \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		 mandir=${D}/usr/share/man	\
+	     sysconfdir=${D}/etc \
+	     localstatedir=${D}/var/lib \
+	     install || die
+
+	# Fix missing icon in Gnome Spash
+	insinto /usr/share/pixmaps
+	newins nautilus-launch-icon.png gnome-launch-icon.png
+
+	dodoc AUTHORS COPYING* ChangeLog* NEWS TODO
+
+	# Fix permissions in order to resolve the mozilla-view issue
+	chmod -R g+r,o+r ${D}/*
+}
+