Forgot a small patch.

Package-Manager: portage-2.0.51.16

4 files changed, 43 insertions, 4 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index a3653dd76d73..84446d3bda45 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.20 2005/02/21 18:19:33 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.21 2005/02/21 20:12:07 latexer Exp $
+
+  21 Feb 2005; Peter Johanson <latexer@gentoo.org>
+  +files/libgdiplus-1.1.4-included-cairo-fix.diff, libgdiplus-1.1.4.ebuild:
+  Forgot a small patch.
 
 *libgdiplus-1.1.4 (21 Feb 2005)
 
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index c18b52d10a9b..e5044c191b7e 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,12 +1,12 @@
 MD5 db69b3c6f4b31d75b91324e6aa080270 libgdiplus-1.0.6-r1.ebuild 1437
-MD5 515c90fe8d47111544509da3de338167 libgdiplus-1.1.4.ebuild 1396
+MD5 ce268a3b89ee7e21a2164c35e2e4f215 libgdiplus-1.1.4.ebuild 1452
 MD5 3aa6a3276235ab9c095d7e8cf778532a libgdiplus-1.0.5-r1.ebuild 1347
 MD5 a6983900668bdd2a30402f26c968252b libgdiplus-1.0.5.ebuild 1275
 MD5 d8c6ba03f1b7facd54241a3baa4bdf01 libgdiplus-1.0.4-r1.ebuild 1278
 MD5 1fcfbc62639c7b2ad4a6a5ebdc6c3e6b libgdiplus-1.0.2.ebuild 1132
 MD5 deba9726050c882d073bc5051a94d3d3 libgdiplus-1.0.4.ebuild 1132
 MD5 d5c7afbe0cd54af8eed7b43da946687c libgdiplus-1.0.5-r2.ebuild 1426
-MD5 3b3254e58ebe7a29f83f18b6df7eb34e ChangeLog 3056
+MD5 c0310b7e3b61bb874c0842c3b56e841a ChangeLog 3208
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 2f6fb4445fbb7578511747368a99a392 libgdiplus-1.0.6.ebuild 1344
 MD5 3ef156941c1a08fe328a986a2eb19097 files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff 14182
@@ -19,3 +19,4 @@ MD5 56f2c6dbb46efdb52c857c5cf107da2e files/digest-libgdiplus-1.0.4-r1 68
 MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r1 68
 MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r2 68
 MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r1 68
+MD5 07efe1db5bae7a73722aac0e952b4e2f files/libgdiplus-1.1.4-included-cairo-fix.diff 1223
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff
new file mode 100644
index 000000000000..5c6d7ffcc3ec
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff
@@ -0,0 +1,33 @@
+diff -aur libgdiplus-1.1.4/configure.in libgdiplus-1.1.4-cairo-fix/configure.in
+--- libgdiplus-1.1.4/configure.in	2005-01-26 20:33:54.000000000 -0500
++++ libgdiplus-1.1.4-cairo-fix/configure.in	2005-02-03 21:20:58.826151752 -0500
+@@ -30,6 +30,7 @@
+ 	CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
+ 	CAIRO_CFLAGS='-I$(top_srcdir)/libpixman/src -I$(top_srcdir)/cairo/src'
+ 	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
++	AM_CONDITIONAL(USE_INCLUDED_CAIRO, true)
+ else
+ 	if pkg-config --exact-version 0.3.0 cairo; then
+ 		echo Cairo installation OK
+@@ -39,6 +40,7 @@
+ 
+ 	CAIRO_LIBS="`pkg-config --libs cairo`"
+ 	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
++	AM_CONDITIONAL(USE_INCLUDED_CAIRO, false)
+ fi
+ 
+ GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`"
+diff -aur libgdiplus-1.1.4/Makefile.am libgdiplus-1.1.4-cairo-fix/Makefile.am
+--- libgdiplus-1.1.4/Makefile.am	2005-01-25 14:43:11.000000000 -0500
++++ libgdiplus-1.1.4-cairo-fix/Makefile.am	2005-02-03 21:15:22.270316016 -0500
+@@ -1,4 +1,9 @@
+-SUBDIRS = libpixman cairo src tests
++SUBDIRS = 
++if USE_INCLUDED_CAIRO
++SUBDIRS += libpixman cairo
++endif
++
++SUBDIRS += src tests
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild
index 8aae8f944e70..3d19078fb03f 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.4.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/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild,v 1.1 2005/02/21 18:19:33 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild,v 1.2 2005/02/21 20:12:07 latexer Exp $
 
 inherit libtool eutils
 
@@ -30,6 +30,7 @@ RDEPEND=">=dev-dotnet/mono-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-included-cairo-fix.diff || die
 	libtoolize --copy --force || die "libtoolize failed"
 	aclocal || die "aclocal failed"
 	autoconf || die "autoconf failed"