diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-04-12 06:16:54 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-04-12 06:16:54 +0000 |
| commit | 5ab2138d5f2267ea68989e85779cda02f4a69b08 (patch) | |
| tree | bf8f0b6722a28d568411ae898f9210bdfd47c64c /dev-ml | |
| parent | transfer ownership back to myself (diff) | |
| download | gentoo-2-5ab2138d5f2267ea68989e85779cda02f4a69b08.tar.gz gentoo-2-5ab2138d5f2267ea68989e85779cda02f4a69b08.tar.bz2 gentoo-2-5ab2138d5f2267ea68989e85779cda02f4a69b08.zip | |
fix build without xpm, bug #297506
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/camlimages/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ml/camlimages/camlimages-3.0.2.ebuild | 5 | ||||
| -rw-r--r-- | dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch | 16 |
3 files changed, 25 insertions, 4 deletions
diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog index 7c58611da1ce..2d1d53a2f0c3 100644 --- a/dev-ml/camlimages/ChangeLog +++ b/dev-ml/camlimages/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/camlimages -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.23 2009/12/26 17:34:19 pva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.24 2010/04/12 06:16:54 aballier Exp $ + + 12 Apr 2010; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild, + +files/camlimages-3.0.2-noxpm.patch: + fix build without xpm, bug #297506 26 Dec 2009; Peter Volkov <pva@gentoo.org> camlimages-2.20-r2.ebuild, camlimages-3.0.1.ebuild, camlimages-3.0.2.ebuild: diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild index 50020dc1b874..d464b34f2060 100644 --- a/dev-ml/camlimages/camlimages-3.0.2.ebuild +++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.4 2009/12/26 17:34:19 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.5 2010/04/12 06:16:54 aballier Exp $ EAPI=2 @@ -34,6 +34,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch" epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch" epatch "${FILESDIR}/${P}-annot.patch" + epatch "${FILESDIR}/${P}-noxpm.patch" eautoreconf } diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch b/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch new file mode 100644 index 000000000000..8c30167febe8 --- /dev/null +++ b/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch @@ -0,0 +1,16 @@ +Index: camlimages-3.0.2/src/Makefile.am +=================================================================== +--- camlimages-3.0.2.orig/src/Makefile.am ++++ camlimages-3.0.2/src/Makefile.am +@@ -185,7 +185,10 @@ CSOURCES += ftintf.c + AM_CFLAGS += $(INCFREETYPE) + endif + +-ocamlsitelib_DATA += units.cmi oXpm.cmi ++ocamlsitelib_DATA += units.cmi ++if HAVE_XPM ++ocamlsitelib_DATA += oXpm.cmi ++endif + if HAVE_TIFF + ocamlsitelib_DATA += oTiff.cmi + endif |