Build fix for new cairo

Package-Manager: portage-2.0.51-r15

4 files changed, 38 insertions, 6 deletions

diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index 9c7970d47128..8ffd312ae35d 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gecko-sdk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.6 2005/02/19 07:52:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.7 2005/02/27 19:00:55 brad Exp $
+
+  27 Feb 2005; Brad Laue <brad@gentoo.org> +files/svg-cairo-0.3.0-fix.patch,
+  gecko-sdk-1.7.5.ebuild:
+  Build fix for Cairo >=0.3.0.
 
 *gecko-sdk-1.7.5 (19 Feb 2005)
 
diff --git a/net-libs/gecko-sdk/Manifest b/net-libs/gecko-sdk/Manifest
index 57aa174c7d58..f4929421a3e7 100644
--- a/net-libs/gecko-sdk/Manifest
+++ b/net-libs/gecko-sdk/Manifest
@@ -1,8 +1,9 @@
-MD5 25bc9c5488ee38a697434b217cb2f896 ChangeLog 863
 MD5 1aa757cd5b43a4dff846df98624954b5 gecko-sdk-1.7.3.ebuild 2038
-MD5 ea4fff0f5f69f91b23657bf0cb9cb4ac gecko-sdk-1.7.5.ebuild 3763
+MD5 cf919378788ddd1da46380fc15676423 gecko-sdk-1.7.5.ebuild 3912
+MD5 e854a126b4d16abd49c2dd43a3c6a5e1 ChangeLog 996
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
-MD5 e5ed08e208ebaa0fc5407ac4a7f42e94 files/digest-gecko-sdk-1.7.5 75
 MD5 068edb8c46e34027f9c3febc19656c70 files/mozilla-1.3-fix-RAW-target.patch 328
-MD5 640ad02464c41c9b820db9b59c7eeaec files/digest-gecko-sdk-1.7.3 75
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 640ad02464c41c9b820db9b59c7eeaec files/digest-gecko-sdk-1.7.3 75
+MD5 e5ed08e208ebaa0fc5407ac4a7f42e94 files/digest-gecko-sdk-1.7.5 75
diff --git a/net-libs/gecko-sdk/files/svg-cairo-0.3.0-fix.patch b/net-libs/gecko-sdk/files/svg-cairo-0.3.0-fix.patch
new file mode 100644
index 000000000000..9d1f0d830559
--- /dev/null
+++ b/net-libs/gecko-sdk/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-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
index 404c2461e461..a10161779093 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-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-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.1 2005/02/19 07:52:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.2 2005/02/27 19:00:55 brad Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
@@ -65,6 +65,11 @@ src_unpack() {
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
 	epatch ${PORTDIR}/net-www/mozilla/files/mozilla-1.7.3-4ft2.patch
 
+	# Patch for newer versions of cairo ( bug #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"
 }