diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-02-21 20:12:07 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-02-21 20:12:07 +0000 |
| commit | 0ed11f67f6444da9062098fe2bc28e1e087cb3ef (patch) | |
| tree | 3ae93f03628cae0156885d1f4b36be93fa2f6425 /dev-dotnet | |
| parent | fixed stupid ebuild error, #82808 (diff) | |
| download | gentoo-2-0ed11f67f6444da9062098fe2bc28e1e087cb3ef.tar.gz gentoo-2-0ed11f67f6444da9062098fe2bc28e1e087cb3ef.tar.bz2 gentoo-2-0ed11f67f6444da9062098fe2bc28e1e087cb3ef.zip | |
Forgot a small patch.
(Portage version: 2.0.51.16)
Diffstat (limited to 'dev-dotnet')
| -rw-r--r-- | dev-dotnet/libgdiplus/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-included-cairo-fix.diff | 33 | ||||
| -rw-r--r-- | dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild | 3 |
3 files changed, 40 insertions, 2 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/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" |