summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-08 07:05:40 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-08 07:05:40 +0000
commit0265f95a09c21b5803d96158a169eedd8d92b3ed (patch)
tree762b5e5f2ac272d6ed547b55e5be4ad271dd80ee /media-libs/imlib2/files
parentfix compilation on hardened systems by filtering SSP, see bug #154338. Thank... (diff)
downloadgentoo-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/files')
-rw-r--r--media-libs/imlib2/files/imlib2-1.3.0-no-X.patch28
1 files changed, 28 insertions, 0 deletions
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