--- a/components/w3m/patches/01-libgc.patch	Tue Oct 25 14:43:21 2016 -0700
+++ b/components/w3m/patches/01-libgc.patch	Mon Nov 07 13:42:00 2016 -0800
@@ -3,31 +3,41 @@
 #
 # This patch needs to be evaluated to see if it needs to be passed upstream.
 
---- w3m-0.5.2.orig/acinclude.m4	Fri Apr  7 08:21:11 2006
-+++ w3m-0.5.2/acinclude.m4	Thu Dec  4 09:32:08 2014
-@@ -426,6 +426,7 @@
- # ----------------------------------------------------------------
- AC_DEFUN([AC_W3M_GC],
- [AC_MSG_CHECKING(GC library exists)
-+AC_SUBST(LIBGC)
- AC_ARG_WITH(gc,
-  [  --with-gc[=PREFIX]	  	libgc PREFIX],
-  [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
-@@ -456,7 +457,7 @@
-    fi
-  fi
-  unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-+ AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"])
+--- w3m-0.5.3/configure.orig	2016-11-03 12:07:41.143467587 +0000
++++ w3m-0.5.3/configure	2016-11-03 12:11:03.646007132 +0000
+@@ -8209,7 +8209,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgc  $LIBS"
++LIBS="`pkg-config --libs bdw-gc` $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -8240,7 +8240,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
+ $as_echo "$ac_cv_lib_gc_GC_init" >&6; }
+ if test "x$ac_cv_lib_gc_GC_init" = x""yes; then :
+-  LIBGC="-lgc"
++  LIBGC="`pkg-config --libs bdw-gc`"
+ fi
+ 
   if test x"$ac_cv_lib_gc_GC_init" = xno; then
-     AC_MSG_CHECKING(GC library location)
-     AC_MSG_RESULT($with_gc)
-@@ -466,7 +467,7 @@
-       LDFLAGS="$LDFLAGS -L$dir/lib"
-       AC_MSG_CHECKING($dir)
-       unset ac_cv_lib_gc_GC_init
--      AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
-+      AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break])
+@@ -8261,7 +8261,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgc  $LIBS"
++LIBS="`pkg-config --libs bdw-gc` $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -8292,7 +8292,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
+ $as_echo "$ac_cv_lib_gc_GC_init" >&6; }
+ if test "x$ac_cv_lib_gc_GC_init" = x""yes; then :
+-  gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break
++  gclibdir="$dir/lib"; LIBGC="-L$dir/lib `pkg-config --libs bdw-gc`"; break
+ fi
+ 
        LDFLAGS="$ldflags"
-     done
-     if test x"$gclibdir" = xno; then