summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2005-05-21 19:47:40 +0000
committerHanno Böck <hanno@gentoo.org>2005-05-21 19:47:40 +0000
commit2c51bf885d141b43ff6bed3eefaaadd11ab9acf5 (patch)
treebf7e1f57a22589048d4c27f70e73a7bc60929a82 /www-client
parentAdded ~sparc keyword. (diff)
downloadgentoo-2-2c51bf885d141b43ff6bed3eefaaadd11ab9acf5.tar.gz
gentoo-2-2c51bf885d141b43ff6bed3eefaaadd11ab9acf5.tar.bz2
gentoo-2-2c51bf885d141b43ff6bed3eefaaadd11ab9acf5.zip
Fix crash with xcomposite (resolves bug #92774).
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/galeon/files/galeon-1.3.20-toolbar-crash.diff11
-rw-r--r--www-client/galeon/galeon-1.3.20.ebuild7
2 files changed, 17 insertions, 1 deletions
diff --git a/www-client/galeon/files/galeon-1.3.20-toolbar-crash.diff b/www-client/galeon/files/galeon-1.3.20-toolbar-crash.diff
new file mode 100644
index 000000000000..276176a37ff9
--- /dev/null
+++ b/www-client/galeon/files/galeon-1.3.20-toolbar-crash.diff
@@ -0,0 +1,11 @@
+--- galeon-1.3.20/libegg/egg-editable-toolbar.c 2004/12/15 17:08:20 1.8
++++ galeon-1.3.20/libegg/egg-editable-toolbar.c 2005/05/01 11:56:27 1.9
+@@ -1402,7 +1402,7 @@
+
+ /* Create a pixmap */
+ visual = gtk_widget_get_visual (window);
+- pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_best_depth());
++ pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, visual->depth);
+ gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
+
+ /* Draw the window */
diff --git a/www-client/galeon/galeon-1.3.20.ebuild b/www-client/galeon/galeon-1.3.20.ebuild
index 99a5b82f3c0d..436d8c689037 100644
--- a/www-client/galeon/galeon-1.3.20.ebuild
+++ b/www-client/galeon/galeon-1.3.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.20.ebuild,v 1.2 2005/05/06 14:55:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/galeon/galeon-1.3.20.ebuild,v 1.3 2005/05/21 19:47:40 hanno Exp $
inherit gnome2 debug libtool eutils
@@ -34,6 +34,11 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.30
>=sys-devel/gettext-0.11"
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/galeon-1.3.20-toolbar-crash.diff
+}
+
src_compile() {
use firefox && myconf="--with-mozilla=firefox"
use firefox || myconf="--with-mozilla=mozilla"