From 49ebfcc0002cfcdcfed2b9fbefff1d788cc08d03 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Thu, 17 Oct 2002 19:16:16 +0000 Subject: [PATCH] add fix for missing X includes that only happen in rare cases --- net-www/mozilla/ChangeLog | 6 +++++- net-www/mozilla/mozilla-1.0-r3.ebuild | 7 ++++++- net-www/mozilla/mozilla-1.0.1-r1.ebuild | 7 ++++++- net-www/mozilla/mozilla-1.1-r1.ebuild | 7 ++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog index 34987616d4af..0a69621b9c48 100644 --- a/net-www/mozilla/ChangeLog +++ b/net-www/mozilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/mozilla # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.40 2002/10/13 13:00:34 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.41 2002/10/17 19:16:16 azarah Exp $ + + 17 Oct 2002; Martin Schlemmer : + Add a fix for bug #7656. This fix the missing headers from + X11/extensions/ in the X include dir. 13 Oct 2002; Martin Schlemmer : Add five patches from Mandrake (actually for moz-1.1 that I hacked diff --git a/net-www/mozilla/mozilla-1.0-r3.ebuild b/net-www/mozilla/mozilla-1.0-r3.ebuild index f08a12061195..07e9d4e87313 100644 --- a/net-www/mozilla/mozilla-1.0-r3.ebuild +++ b/net-www/mozilla/mozilla-1.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0-r3.ebuild,v 1.17 2002/10/15 13:24:31 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0-r3.ebuild,v 1.18 2002/10/17 19:16:16 azarah Exp $ IUSE="moznomail java mozp3p mozaccess gtk2 mozinterfaceinfo ssl ldap mozxmlterm mozctl gnome mozsvg" @@ -108,6 +108,11 @@ src_unpack() { cd ${S}/widget/src/gtk2 bzip2 -dc ${FILESDIR}/gtk2_widget.patch.bz2 | patch -p0 || die fi + + # Fix bug #7656 + cd ${S}/other-licenses/Xft/Xrender + ln -s /usr/X11R6/include/X11/extensions/Xext.h Xext.h + ln -s /usr/X11R6/include/X11/extensions/renderproto.h renderproto.h } src_compile() { diff --git a/net-www/mozilla/mozilla-1.0.1-r1.ebuild b/net-www/mozilla/mozilla-1.0.1-r1.ebuild index 93eb5c449d02..0ca760e307a9 100644 --- a/net-www/mozilla/mozilla-1.0.1-r1.ebuild +++ b/net-www/mozilla/mozilla-1.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r1.ebuild,v 1.9 2002/10/15 13:24:31 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r1.ebuild,v 1.10 2002/10/17 19:16:16 azarah Exp $ IUSE="mozxmlterm moznomail java mozp3p crypt ipv6 gtk2 mozinterfaceinfo ssl ldap mozaccess mozctl gnome mozsvg" @@ -106,6 +106,11 @@ src_unpack() { mv ${WORKDIR}/ipc ${S}/extensions/ mv ${WORKDIR}/enigmail ${S}/extensions/ fi + + # Fix bug #7656 + cd ${S}/other-licenses/Xft/Xrender + ln -s /usr/X11R6/include/X11/extensions/Xext.h Xext.h + ln -s /usr/X11R6/include/X11/extensions/renderproto.h renderproto.h } src_compile() { diff --git a/net-www/mozilla/mozilla-1.1-r1.ebuild b/net-www/mozilla/mozilla-1.1-r1.ebuild index ada62359afa9..998ee5a6ef77 100644 --- a/net-www/mozilla/mozilla-1.1-r1.ebuild +++ b/net-www/mozilla/mozilla-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1-r1.ebuild,v 1.8 2002/10/15 13:24:31 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1-r1.ebuild,v 1.9 2002/10/17 19:16:16 azarah Exp $ IUSE="moznomail java mozp3p crypt ldap gtk2 mozinterfaceinfo ssl mozaccess mozxmlterm mozctl gnome mozsvg" @@ -95,6 +95,11 @@ src_unpack() { if [ -n "`use gtk2`" ]; then patch -p0 <${FILESDIR}/gtk2mozilla_head_patch || die "the gtk2 patch failed" fi + + # Fix bug #7656 + cd ${S}/other-licenses/Xft/Xrender + ln -s /usr/X11R6/include/X11/extensions/Xext.h Xext.h + ln -s /usr/X11R6/include/X11/extensions/renderproto.h renderproto.h } src_compile() { -- 2.26.2