diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2006-04-07 13:12:18 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2006-04-07 13:12:18 +0000 |
| commit | b4941b0180622dfd6be3121fa55f9f4a921192aa (patch) | |
| tree | a0720e1bbee15fe9d1b81c861dfce24f007f82ff /media-libs/fontconfig | |
| parent | Stable on sparc wrt #128317 (diff) | |
| download | gentoo-2-b4941b0180622dfd6be3121fa55f9f4a921192aa.tar.gz gentoo-2-b4941b0180622dfd6be3121fa55f9f4a921192aa.tar.bz2 gentoo-2-b4941b0180622dfd6be3121fa55f9f4a921192aa.zip | |
fix possible build issue
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-libs/fontconfig')
| -rw-r--r-- | media-libs/fontconfig/ChangeLog | 3 | ||||
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch | 15 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild | 11 |
3 files changed, 25 insertions, 4 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog index 171c0953abd8..9d2b904ee231 100644 --- a/media-libs/fontconfig/ChangeLog +++ b/media-libs/fontconfig/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for media-libs/fontconfig # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.66 2006/04/07 11:18:52 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.67 2006/04/07 13:12:18 foser Exp $ *fontconfig-2.3.2-r1 (07 Apr 2006) @@ -10,6 +10,7 @@ Remove reference to /usr/X11R6 in configure (#122526) Install more docs (#124287, thanks to Andy Kittner) Add aliases for symbol and dingbats fonts (#124238, thanks to Florian Mickler) + Add docbook switch, so we can disable it hard (#124287, thanks exg) 31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> fontconfig-2.3.2.ebuild: diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch new file mode 100644 index 000000000000..6a6c01e26f64 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch @@ -0,0 +1,15 @@ +--- configure.in.old 2006-03-31 18:31:26.000000000 +0200 ++++ configure.in 2006-03-31 18:44:47.000000000 +0200 +@@ -407,7 +407,11 @@ + # Let people not build/install docs if they don't have docbook + # + +-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) ++AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,) ++ ++if test x$enable_docbook != xno; then ++ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) ++fi + + AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes) + diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild index 4584efc042e4..3cf7171a4ed7 100644 --- a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild +++ b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.2 2006/04/07 12:45:23 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.3 2006/04/07 13:12:18 foser Exp $ -inherit eutils libtool +inherit eutils libtool autotools DESCRIPTION="A library for configuring and customizing font access" HOMEPAGE="http://fontconfig.org/" @@ -25,8 +25,12 @@ src_unpack() { epatch ${FILESDIR}/${P}-symbol_alias.patch # fix pkgconfig includes (#83623) epatch ${FILESDIR}/${P}-pkg_config.patch + # add docbook switch so we can disable it + epatch ${FILESDIR}/${P}-docbook.patch - elibtoolize + eautoreconf + + # elibtoolize epunt_cxx #74077 } @@ -38,6 +42,7 @@ src_compile() { # disable docs only disables local docs generation, they come with the tarball econf --disable-docs \ + --disable-docbook \ --with-docdir=/usr/share/doc/${PF} \ --with-default-fonts=/usr/share/fonts \ --with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \ |