summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2005-05-21 19:47:40 +0000
committerHanno Boeck <hanno@gentoo.org>2005-05-21 19:47:40 +0000
commit8fd62679592aa195e5104a993e252f64775f44cc (patch)
tree5583705882b493da4affbcc1b28ba244341b39e3 /www-client/galeon
parentAdded ~sparc keyword. (diff)
downloadhistorical-8fd62679592aa195e5104a993e252f64775f44cc.tar.gz
historical-8fd62679592aa195e5104a993e252f64775f44cc.tar.bz2
historical-8fd62679592aa195e5104a993e252f64775f44cc.zip
Fix crash with xcomposite (resolves bug #92774).
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'www-client/galeon')
-rw-r--r--www-client/galeon/Manifest21
-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
3 files changed, 23 insertions, 16 deletions
diff --git a/www-client/galeon/Manifest b/www-client/galeon/Manifest
index 399967aef60e..b2bc0a3fbe64 100644
--- a/www-client/galeon/Manifest
+++ b/www-client/galeon/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fb15acd09f964e9a971da8d720303c69 ChangeLog 16280
-MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
-MD5 39329fc40f23a51b43b3bd2638919dd7 galeon-1.3.20.ebuild 1324
MD5 a499e17bed3c88e01a4742d9f55b1e26 galeon-1.3.17.ebuild 1589
MD5 9db0e855090f5501a6983019b8ed6b3f galeon-1.3.18.ebuild 1585
MD5 3b26c42561fb9cbd39bf75d19334a105 galeon-1.3.19.ebuild 1583
-MD5 e341b08e0c484831306b28a3429883ff files/digest-galeon-1.3.20 67
-MD5 bb092f2e34cd7f5be1ad94e328760e31 files/digest-galeon-1.3.19 67
+MD5 4c1c1e710ea77d8d7db9906084c4228d metadata.xml 215
+MD5 fb15acd09f964e9a971da8d720303c69 ChangeLog 16280
+MD5 d293f71833e693ae621e057ceabb90bb galeon-1.3.20.ebuild 1405
MD5 f688ddbf98228c4b9511250144ebfcf9 files/digest-galeon-1.3.17 67
MD5 88ccf8b5a77bd6f7aa00c0d3366ffed8 files/digest-galeon-1.3.18 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFChbWJKf2g/qXtneoRArM6AJ98+1GZ9okqWl0T8T8GEscbdxQg0wCdHy5C
-ih+qni0ZB1LLkUYpO/MHNa8=
-=3Ngv
------END PGP SIGNATURE-----
+MD5 bb092f2e34cd7f5be1ad94e328760e31 files/digest-galeon-1.3.19 67
+MD5 e341b08e0c484831306b28a3429883ff files/digest-galeon-1.3.20 67
+MD5 5fe8b0cd6c33b466d49ba5ac05ff931b files/galeon-1.3.20-toolbar-crash.diff 518
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"