diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-08 07:05:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-08 07:05:40 +0000 |
| commit | 0265f95a09c21b5803d96158a169eedd8d92b3ed (patch) | |
| tree | 762b5e5f2ac272d6ed547b55e5be4ad271dd80ee /media-libs/imlib2 | |
| parent | fix compilation on hardened systems by filtering SSP, see bug #154338. Thank... (diff) | |
| download | gentoo-2-0265f95a09c21b5803d96158a169eedd8d92b3ed.tar.gz gentoo-2-0265f95a09c21b5803d96158a169eedd8d92b3ed.tar.bz2 gentoo-2-0265f95a09c21b5803d96158a169eedd8d92b3ed.zip | |
Fix building with USE=-X #154304 by Christophe PEREZ.
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'media-libs/imlib2')
| -rw-r--r-- | media-libs/imlib2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/imlib2/files/imlib2-1.3.0-no-X.patch | 28 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-1.3.0.ebuild | 7 |
3 files changed, 38 insertions, 3 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog index ca7ba5dba126..2a0a8b1fa9a8 100644 --- a/media-libs/imlib2/ChangeLog +++ b/media-libs/imlib2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.49 2006/11/06 15:12:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.50 2006/11/08 07:05:40 vapier Exp $ + + 08 Nov 2006; Mike Frysinger <vapier@gentoo.org> + +files/imlib2-1.3.0-no-X.patch, imlib2-1.3.0.ebuild: + Fix building with USE=-X #154304 by Christophe PEREZ. *imlib2-1.3.0 (06 Nov 2006) diff --git a/media-libs/imlib2/files/imlib2-1.3.0-no-X.patch b/media-libs/imlib2/files/imlib2-1.3.0-no-X.patch new file mode 100644 index 000000000000..408b029ae4a4 --- /dev/null +++ b/media-libs/imlib2/files/imlib2-1.3.0-no-X.patch @@ -0,0 +1,28 @@ +http://bugs.gentoo.org/154304 + +Index: configure.in +=================================================================== +RCS file: /cvs/e/e17/libs/imlib2/configure.in,v +retrieving revision 1.134 +retrieving revision 1.135 +diff -u -p -r1.134 -r1.135 +--- configure.in 7 Nov 2006 04:37:34 -0000 1.134 ++++ configure.in 8 Nov 2006 06:46:58 -0000 1.135 +@@ -183,10 +183,13 @@ AC_ARG_WITH(freetype-config, [ --with-f + freetype_cflags=`$FREETYPE_CONFIG --cflags` + freetype_libs=`$FREETYPE_CONFIG --libs` + +-AC_CHECK_HEADER(X11/X.h, +- [ have_x="yes" ], +- [ have_x="no" ]) +- ++AC_PATH_X ++if test "x$have_x" != "xdisabled"; then ++ AC_CHECK_HEADER(X11/X.h, ++ [ have_x="yes" ], ++ [ have_x="no" ]) ++fi ++ + if test "x$have_x" = "xno"; then + # If --without-x was passed, this will be "disabled" instead of "no" -- + # so always treat "no" as an error diff --git a/media-libs/imlib2/imlib2-1.3.0.ebuild b/media-libs/imlib2/imlib2-1.3.0.ebuild index 2b2e53e71865..c29e05203f31 100644 --- a/media-libs/imlib2/imlib2-1.3.0.ebuild +++ b/media-libs/imlib2/imlib2-1.3.0.ebuild @@ -1,7 +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/imlib2/imlib2-1.3.0.ebuild,v 1.1 2006/11/06 15:12:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.3.0.ebuild,v 1.2 2006/11/08 07:05:40 vapier Exp $ +WANT_AUTOTOOLS="yes" inherit enlightenment toolchain-funcs MY_P=${P/_/-} @@ -23,7 +24,9 @@ DEPEND="=media-libs/freetype-2* src_unpack() { enlightenment_src_unpack cd "${S}"/src/modules/loaders - epatch "${FILESDIR}"/${P}-buf-checks.patch + epatch "${FILESDIR}"/${P}-buf-checks.patch #154216 + cd "${S}" + epatch "${FILESDIR}"/${P}-no-X.patch #154304 } src_compile() { |