summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Laue <brad@gentoo.org>2005-02-27 09:09:59 +0000
committerBrad Laue <brad@gentoo.org>2005-02-27 09:09:59 +0000
commit5df113f72dbf587b5f721d61a4d8eadc9a5e1e98 (patch)
treefbbb26f6bbf8cc433cdf4a2278f02a491ce2bb38 /net-www/mozilla
parentremove broken patch (diff)
downloadgentoo-2-5df113f72dbf587b5f721d61a4d8eadc9a5e1e98.tar.gz
gentoo-2-5df113f72dbf587b5f721d61a4d8eadc9a5e1e98.tar.bz2
gentoo-2-5df113f72dbf587b5f721d61a4d8eadc9a5e1e98.zip
Fix for cairo
(Portage version: 2.0.51-r15)
Diffstat (limited to 'net-www/mozilla')
-rw-r--r--net-www/mozilla/files/svg-cairo-0.3.0-fix.patch22
-rw-r--r--net-www/mozilla/mozilla-1.7.5.ebuild7
2 files changed, 28 insertions, 1 deletions
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