version up: w3m 0.5.3+git20180125 from Debian

Mainly to fix parallel build.

Conflicts:
	component/w3m/buildout.cfg

component/w3m/buildout.cfg

@@ -13,8 +13,9 @@ parts =
 
 [w3m]
 recipe = slapos.recipe.cmmi
-md5sum = 1b845a983a50b8dec0169ac48479eacc
-url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
+version = v0.5.3+git20180125
+md5sum = 199b6ea6f2390bd6675278bcc9f677a9
+url = https://salsa.debian.org/debian/w3m/-/archive/${:version}/w3m-${:version}.tar.bz2
 configure-options =
   --with-gc=${garbage-collector:location}
   --with-ssl=${openssl:location}
@@ -29,15 +30,6 @@ configure-options =
   --disable-external-uri-loader
   --disable-w3mmailer
 
-patch-options =
-  -p1
-
-# http://lists.opensuse.org/opensuse-commit/2011-09/msg00222.html
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.2-gc72.patch
-patches =
-  ${:_profile_base_location_}/w3m.gcc.forward.compat.patch#75422a6f7f671b3a6d9add6724cc0945
-  ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
-
 environment =
   PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig

component/w3m/w3m-0.5.2-gc72.patch

-diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
---- w3m-0.5.2.orig/main.c	2007-05-31 10:19:50.000000000 +0900
-+++ w3m-0.5.2/main.c	2009-11-09 08:20:02.184953443 +0900
-@@ -312,7 +312,11 @@
- 	    lock = 0;
- 	}
-     }
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    else if (orig_GC_warn_proc = GC_get_warn_proc())
-+#else
-     else if (orig_GC_warn_proc)
-+#endif
- 	orig_GC_warn_proc(msg, arg);
-     else
- 	fprintf(stderr, msg, (unsigned long)arg);
-@@ -842,7 +846,11 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-+#else
-     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+#endif
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */

component/w3m/w3m.gcc.forward.compat.patch

-diff --git a/istream.c b/istream.c
-index 8967280..d4c788a 100644
---- a/istream.c
-+++ b/istream.c
-@@ -22,8 +22,8 @@
- static void basic_close(int *handle);
- static int basic_read(int *handle, char *buf, int len);
- 
--static void file_close(struct file_handle *handle);
--static int file_read(struct file_handle *handle, char *buf, int len);
-+static void file_close(struct w3m_file_handle *handle);
-+static int file_read(struct w3m_file_handle *handle, char *buf, int len);
- 
- static int str_read(Str handle, char *buf, int len);
- 
-@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) ())
-     stream = New(union input_stream);
-     init_base_stream(&stream->base, STREAM_BUF_SIZE);
-     stream->file.type = IST_FILE;
--    stream->file.handle = New(struct file_handle);
-+    stream->file.handle = New(struct w3m_file_handle);
-     stream->file.handle->f = f;
-     if (closep)
- 	stream->file.handle->close = closep;
-@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int len)
- }
- 
- static void
--file_close(struct file_handle *handle)
-+file_close(struct w3m_file_handle *handle)
- {
-     handle->close(handle->f);
- }
- 
- static int
--file_read(struct file_handle *handle, char *buf, int len)
-+file_read(struct w3m_file_handle *handle, char *buf, int len)
- {
-     return fread(buf, 1, len, handle->f);
- }
-diff --git a/istream.h b/istream.h
-index a220d8b..6d9736d 100644
---- a/istream.h
-+++ b/istream.h
-@@ -20,7 +20,7 @@ struct stream_buffer {
- 
- typedef struct stream_buffer *StreamBuffer;
- 
--struct file_handle {
-+struct w3m_file_handle {
-     FILE *f;
-     void (*close) ();
- };
-@@ -53,7 +53,7 @@ struct base_stream {
- 
- struct file_stream {
-     struct stream_buffer stream;
--    struct file_handle *handle;
-+    struct w3m_file_handle *handle;
-     char type;
-     char iseos;
-     int (*read) ();