Fix for cairo

Package-Manager: portage-2.0.51-r15

3 files changed, 36 insertions, 8 deletions

diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 997460a7782f..da3798d6b9ed 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,15 +1,16 @@
+MD5 c8b95824d594390c0e10f5f8296c0e5c mozilla-1.7.5.ebuild 10325
 MD5 f70ab38cfea73c39cc97ad746d77fe5e ChangeLog 38482
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 37d850804fd95f9eb515a16255e72382 mozilla-1.7.5.ebuild 10183
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
 MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203
+MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 5496222980a6faf8261066f43cd4c6a5 files/mozilla-hppa.patch 7785
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-1.7.5-stackgrowth.patch 931
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
diff --git a/net-www/mozilla/files/svg-cairo-0.3.0-fix.patch b/net-www/mozilla/files/svg-cairo-0.3.0-fix.patch
new file mode 100644
index 000000000000..9d1f0d830559
--- /dev/null
+++ b/net-www/mozilla/files/svg-cairo-0.3.0-fix.patch
@@ -0,0 +1,22 @@
+diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp
+--- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp	2004-02-10 15:18:09.000000000 -0500
++++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoCanvas.cpp	2005-02-23 20:25:32.240459288 -0500
+@@ -50,6 +50,7 @@
+ #include "nsRenderingContextGTK.h"
+ #include <gdk/gdkx.h>
+ #include <cairo.h>
++#include <cairo-xlib.h>
+ 
+ /**
+  * \addtogroup cairo_renderer Cairo Rendering Engine
+diff -aur mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp
+--- mozilla-orig/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp	2004-03-16 16:40:07.000000000 -0500
++++ mozilla/layout/svg/renderer/src/cairo/nsSVGCairoGlyphMetrics.cpp	2005-02-23 20:25:09.538910448 -0500
+@@ -51,6 +51,7 @@
+ #include "nsSVGTypeCIDs.h"
+ #include "nsIComponentManager.h"
+ #include <cairo.h>
++#include <stdlib.h>
+ 
+ /**
+  * \addtogroup gdiplus_renderer Cairo Rendering Engine
diff --git a/net-www/mozilla/mozilla-1.7.5.ebuild b/net-www/mozilla/mozilla-1.7.5.ebuild
index dfe7f83d454d..f72802b45536 100644
--- a/net-www/mozilla/mozilla-1.7.5.ebuild
+++ b/net-www/mozilla/mozilla-1.7.5.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/net-www/mozilla/mozilla-1.7.5.ebuild,v 1.10 2005/01/24 19:41:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.5.ebuild,v 1.11 2005/02/27 09:09:59 brad Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
@@ -71,6 +71,11 @@ src_unpack() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
 	epatch ${FILESDIR}/mozilla-1.7.3-4ft2.patch
 
+	# Patch for newer versions of cairo (#80301) 
+	if has_version '>=x11-libs/cairo-0.3.0'; then
+		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
+	fi
+
 	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
 
 	# Unpack the enigmail plugin