summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2014-03-05 19:11:34 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2014-03-05 19:11:34 -0500
commitff8cef8887e9c4b646c4aeebb39fea22c63fba23 (patch)
tree1fbf447bb866e7a2beda3f149a4dfc325e3763ab
parent44ae571c1d57a21af2c915b42bb656cf0d69c9ee (diff)
Add w3m-0.5.3-imlib2-config.patch
-rw-r--r--extra/w3m/PKGBUILD6
-rw-r--r--extra/w3m/w3m-0.5.3-imlib2-config.patch60
2 files changed, 64 insertions, 2 deletions
diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD
index 68462be22..a5b2c98c9 100644
--- a/extra/w3m/PKGBUILD
+++ b/extra/w3m/PKGBUILD
@@ -16,12 +16,14 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgnam
'form_unknown.patch'
'file_handle.patch'
'https.patch'
- 'gc72.patch')
+ 'gc72.patch'
+ 'w3m-0.5.3-imlib2-config.patch')
sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
'23d648033ad77f3c67d370c62cf7b7ed86b5c6f2'
'457de43be7eabc652614461a7ab25e3ba76b2aff'
'66affb2f695fe0bdde25cf774642bfd6a9404e88'
- '7baa06ca684fd140503a2adc65e2d606970c4662')
+ '7baa06ca684fd140503a2adc65e2d606970c4662'
+ '912f5af53a37dd6dc9b08958ad6e4abb03cb8c88')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
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;}