summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/imlib2/files/imlib2-1.4.6-no-x.patch')
-rw-r--r--media-libs/imlib2/files/imlib2-1.4.6-no-x.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch b/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
new file mode 100644
index 000000000000..b3ce989b9c3e
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/517670
+
+already in upstream
+
+From 3e6ca0b48d2b07980c310935ad1a8dde209efed5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 28 Jul 2014 23:01:23 -0400
+Subject: [PATCH] do not link with X libs when X is disabled
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/lib/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index b03f753..93c708f 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -84,7 +84,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
+
+ EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
+
+-MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
++MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
++if BUILD_X11
++MY_LIBS += -lXext -lX11
++endif
+
+ if BUILD_MMX
+ libImlib2_la_LIBADD = $(MMX_OBJS) $(MY_LIBS)
+--
+2.0.0
+