new revision that fixes the crash on close bug

4 files changed, 135 insertions, 1 deletions

diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 8fe190552ae8..9439e89a4f08 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for net-www/galeon
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.17 2002/07/25 01:09:22 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.18 2002/08/28 23:58:17 spider Exp $
 
+
+*galeon-1.2.5-r1 (29 Aug 2002)
+  29 Aug 2002; Spider <spider@gentoo.org> galeon-1.2.5-r1.ebuild :
+  Fix for the crash on close bugs 
+  thanks to TGL <degrenier@easyconnect.fr> for the fix
+
+
+  
   25 Jul 2002; Spider <spider@gentoo.org> galeon-1.2.5.ebuild :
   some minor dep changes to make it not pull in gnome2 stuff while we wait for the new portage syntax
   
diff --git a/net-www/galeon/files/digest-galeon-1.2.5-r1 b/net-www/galeon/files/digest-galeon-1.2.5-r1
new file mode 100644
index 000000000000..3a86b5617b6c
--- /dev/null
+++ b/net-www/galeon/files/digest-galeon-1.2.5-r1
@@ -0,0 +1 @@
+MD5 8e41655bebe6a5f08ad43b1403b858b2 galeon-1.2.5.tar.gz 4004289
diff --git a/net-www/galeon/files/galeon-multitabfix.diff b/net-www/galeon/files/galeon-multitabfix.diff
new file mode 100644
index 000000000000..dfe53bdacc9c
--- /dev/null
+++ b/net-www/galeon/files/galeon-multitabfix.diff
@@ -0,0 +1,14 @@
+diff -ur galeon-1.2.5/src/window_callbacks.c galeon-1.2.5-ice/src/window_callbacks.c
+--- galeon-1.2.5/src/window_callbacks.c	Thu May 23 18:06:20 2002
++++ galeon-1.2.5-ice/src/window_callbacks.c	Fri Jun 28 16:04:36 2002
+@@ -2085,8 +2085,9 @@
+ 	window_update_tab_controls (window);
+ 
+ 	/* update the statusbar */
+-	window_statusbar_set_security_icon (window, embed->secure,
+-					    embed->security_tooltip);
++    if (!(old_embed && embed->secure == old_embed->secure))
++        window_statusbar_set_security_icon (window, embed->secure,
++					        embed->security_tooltip);
+ 	window_statusbar_update_message (window);
+ 	window_statusbar_update_progress_bar (window);
diff --git a/net-www/galeon/galeon-1.2.5-r1.ebuild b/net-www/galeon/galeon-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..646502881441
--- /dev/null
+++ b/net-www/galeon/galeon-1.2.5-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.3.ebuild,v 1.2 2002/05/27 17:27:39 drobbins Exp
+S=${WORKDIR}/${P}
+DESCRIPTION="A small web-browser for gnome that uses mozillas render engine"
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
+	 mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://galeon.sourceforge.net"
+
+LICENSE="gpl-2"
+KEYWORDS="*"
+SLOT="0"
+
+# dont merge mozilla-1.0, as it wont work with galeon, rather start
+# with mozilla-1.0-r1
+DEPEND="~net-www/mozilla-1.0
+	>net-www/mozilla-1.0
+	>=gnome-base/gnome-libs-1.4.1.4
+	<=gnome-base/libglade-0.99.0
+	=gnome-base/gnome-vfs-1.0*
+	=gnome-base/gconf-1.0*
+	>=gnome-base/oaf-0.6.7
+	>=dev-libs/libxml-1.8.16
+	>=media-libs/gdk-pixbuf-0.16.0-r1
+	nls? ( sys-devel/gettext
+	>=dev-util/intltool-0.11 )"
+
+	# bonobo? ( >=gnome-base/bonobo-1.0.19-r1 )
+
+pkg_setup() {
+
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk.so ]
+	then
+		eerror
+		eerror "It seems that your Mozilla was not compiled against gtk+-1.2,"
+		eerror "but rather gtk+-2.0.  As Galeon do not support this setup yet,"
+		eerror "you will have to remerge Mozilla with gtk+-1.2 support.  This"
+		eerror "can be done by taking \"gtk2\" out of your USE flags:"
+		eerror
+		eerror " # USE="-gtk2" emerge mozilla "
+		eerror
+		die "Need Mozilla compiled with gtk+-1.2!!"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+    patch -p1 < ${FILESDIR}/galeon-multitabfix.diff
+    # These patches break on this version of galeon.
+	# Are they needed for gcc3/3.1 support?
+	#patch -p1 < ${FILESDIR}/galeon-1.2.0-gcc3.patch || die
+	#patch -p1 < ${FILESDIR}/galeon-1.2.1-gcc3.1.patch || die
+}
+
+src_compile() {
+
+	local myconf=""
+
+	use nls || myconf="${myconf} --disable-nls"
+	# use bonobo && myconf="${myconf} --enable-gnome-file-selector"
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--with-mozilla-libs=${MOZILLA_FIVE_HOME} \
+		--with-mozilla-includes=${MOZILLA_FIVE_HOME}/include \
+		--without-debug	--disable-werror \
+		--disable-applet \
+		--disable-install-schemas \
+		--enable-nautilus-view=no \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+
+	# galeon-config-tool was rewritten for 1.2.0 and causes sandbox
+	# violations if gconfd is shut down...  The schemas seem to install
+	# fine without it (at least it seems like it... *sigh*)
+	#gconftool --shutdown
+
+	make prefix=${D}/usr \
+	     mandir=${D}/usr/share/man \
+	     sysconfdir=${D}/etc \
+	     localstatedir=${D}/var/lib \
+	     install || die
+
+	dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
+}
+
+pkg_postinst() {
+
+	galeon-config-tool --fix-gconf-permissions
+	galeon-config-tool --pkg-install-schemas
+	scrollkeeper-update
+	
+	if [ -z "`use gnome`" ]
+	then
+		einfo "Please remerge libglade with gnome support, or else galeon"
+		einfo "will not be able to start up."
+		einfo
+		einfo 'To do this, type: '
+		einfo 'USE="gnome" emerge libglade'
+	fi
+}
+