summaryrefslogtreecommitdiff
path: root/extra/w3m/w3m-0.5.3-imlib2-config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/w3m/w3m-0.5.3-imlib2-config.patch')
-rw-r--r--extra/w3m/w3m-0.5.3-imlib2-config.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/extra/w3m/w3m-0.5.3-imlib2-config.patch b/extra/w3m/w3m-0.5.3-imlib2-config.patch
new file mode 100644
index 000000000..eea629d54
--- /dev/null
+++ b/extra/w3m/w3m-0.5.3-imlib2-config.patch
@@ -0,0 +1,60 @@
+--- w3m-0.5.3.orig/acinclude.m4 2011-01-04 04:22:18.000000000 -0500
++++ w3m-0.5.3/acinclude.m4 2014-02-25 06:34:43.314819335 -0500
+@@ -649,6 +649,9 @@
+ fi;;
+ imlib2)
+ with_imlib2="yes"
++ if test x"$PKG_CONFIG" = x; then
++ PKG_CONFIG=pkg-config
++ fi
+ if test x"$IMLIB2_CONFIG" = x; then
+ IMLIB2_CONFIG=imlib2-config
+ fi;;
+@@ -728,7 +731,7 @@
+ IMGTARGETS="x11"
+ AC_DEFINE(USE_IMLIB2)
+ IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
+- IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
++ IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`"
+ else
+ AC_MSG_WARN([unable to build w3mimgdisplay with X11 support])
+ fi
+@@ -756,7 +759,7 @@
+ AC_DEFINE(USE_IMLIB2)
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
+ IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
+- IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
++ IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`"
+ else
+ AC_MSG_WARN([unable to build w3mimgdisplay with FB support])
+ fi
+--- w3m-0.5.3.orig/configure 2011-01-14 22:04:22.000000000 -0500
++++ w3m-0.5.3/configure 2014-02-25 06:30:57.064208984 -0500
+@@ -6811,6 +6811,9 @@
+ fi;;
+ imlib2)
+ with_imlib2="yes"
++ if test x"$PKG_CONFIG" = x; then
++ PKG_CONFIG=pkg-config
++ fi
+ if test x"$IMLIB2_CONFIG" = x; then
+ IMLIB2_CONFIG=imlib2-config
+ fi;;
+@@ -6955,7 +6958,7 @@
+ $as_echo "#define USE_IMLIB2 1" >>confdefs.h
+
+ IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
+- IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
++ IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5
+ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;}
+@@ -6991,7 +6994,7 @@
+
+ IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
+ IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
+- IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
++ IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5
+ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;}