diff options
Diffstat (limited to 'net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff')
| -rw-r--r-- | net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff | 136 |
1 files changed, 0 insertions, 136 deletions
diff --git a/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff b/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff deleted file mode 100644 index b72c80255159..000000000000 --- a/net-www/w3m/files/w3m-0.4.2-imglib-gentoo.diff +++ /dev/null @@ -1,136 +0,0 @@ -diff -urN w3m-0.4.2.ORIG/acinclude.m4 w3m-0.4.2/acinclude.m4 ---- w3m-0.4.2.ORIG/acinclude.m4 2003-10-03 07:24:52.000000000 +0900 -+++ w3m-0.4.2/acinclude.m4 2003-10-05 04:18:31.000000000 +0900 -@@ -599,6 +599,12 @@ - enable_image=x11,fb - fi;; - esac -+ AC_ARG_WITH(imglib, -+ [ --with-imglib=IMGLIB image library to link -+ (IMGLIB should be either gdk_pixbuf, imlib or imlib2. -+ Note that you need to use gdk_pixbuf or imlib2 to enable -+ inline image handler support for framebuffer device.)], -+ [test x"$with_imglib" = xyes || imglib="$with_imglib"]) - fi - save_ifs="$IFS"; IFS=","; - for img in $enable_image; do -@@ -640,21 +646,27 @@ - [have_imlib2="yes"], - [have_imlib2="no"])]) - if test x"$x11" = xyes; then -- if test x"$have_gdkpixbuf" = xyes; then -+ if test x"$have_gdkpixbuf" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = xgdk_pixbuf; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_GDKPIXBUF) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" - IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" - IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib" - IMGTARGETS="x11" -- elif test x"$have_imlib" = xyes; then -+ elif test x"$have_imlib" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_IMLIB) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" - IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`" - IMGTARGETS="x11" -- elif test x"$have_imlib2" = xyes; then -+ elif test x"$have_imlib2" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib2; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_IMLIB2) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" -@@ -666,14 +678,18 @@ - fi - fi - if test x"$fb" = xyes; then -- if test x"$have_gdkpixbuf" = xyes; then -+ if test x"$have_gdkpixbuf" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = xgdk_pixbuf; then - AC_DEFINE(USE_W3MIMG_FB) - AC_DEFINE(USE_GDKPIXBUF) - IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" - IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" - IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`" - IMGTARGETS="${IMGTARGETS} fb" -- elif test x"$have_imlib2" = xyes; then -+ elif test x"$have_imlib2" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib2; then - AC_DEFINE(USE_W3MIMG_FB) - AC_DEFINE(USE_IMLIB2) - IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" -diff -urN w3m-0.4.2.ORIG/aclocal.m4 w3m-0.4.2/aclocal.m4 ---- w3m-0.4.2.ORIG/aclocal.m4 2003-10-03 07:24:52.000000000 +0900 -+++ w3m-0.4.2/aclocal.m4 2003-10-05 04:22:54.000000000 +0900 -@@ -611,6 +611,12 @@ - enable_image=x11,fb - fi;; - esac -+ AC_ARG_WITH(imglib, -+ [ --with-imglib=IMGLIB image library to link -+ (IMGLIB should be either gdk_pixbuf, imlib or imlib2. -+ Note that you need to use gdk_pixbuf or imlib2 to enable -+ inline image handler support for framebuffer device.)], -+ [test x"$with_imglib" = xyes || imglib="$with_imglib"]) - fi - save_ifs="$IFS"; IFS=","; - for img in $enable_image; do -@@ -652,21 +658,27 @@ - [have_imlib2="yes"], - [have_imlib2="no"])]) - if test x"$x11" = xyes; then -- if test x"$have_gdkpixbuf" = xyes; then -+ if test x"$have_gdkpixbuf" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = xgdk_pixbuf; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_GDKPIXBUF) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" - IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" - IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib" - IMGTARGETS="x11" -- elif test x"$have_imlib" = xyes; then -+ elif test x"$have_imlib" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_IMLIB) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" - IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`" - IMGTARGETS="x11" -- elif test x"$have_imlib2" = xyes; then -+ elif test x"$have_imlib2" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib2; then - AC_DEFINE(USE_W3MIMG_X11) - AC_DEFINE(USE_IMLIB2) - IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o" -@@ -678,14 +690,18 @@ - fi - fi - if test x"$fb" = xyes; then -- if test x"$have_gdkpixbuf" = xyes; then -+ if test x"$have_gdkpixbuf" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = xgdk_pixbuf; then - AC_DEFINE(USE_W3MIMG_FB) - AC_DEFINE(USE_GDKPIXBUF) - IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" - IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`" - IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`" - IMGTARGETS="${IMGTARGETS} fb" -- elif test x"$have_imlib2" = xyes; then -+ elif test x"$have_imlib2" = xyes \ -+ -a -z "$with_imglib" \ -+ -o x"$with_imglib" = ximlib2; then - AC_DEFINE(USE_W3MIMG_FB) - AC_DEFINE(USE_IMLIB2) - IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" |