# HG changeset patch
# User Richard Dunbar <mojo@slitaz.org>
# Date 1363353707 0
# Node ID 65f9b9b388d76f4fd0fa60a71db766dd85bf8f86
# Parent  512c93d7c3b444c19c6959a57678e590aaa75982
w3m: add patches

diff -r 512c93d7c3b4 -r 65f9b9b388d7 w3m/stuff/file_handle.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/w3m/stuff/file_handle.patch	Fri Mar 15 13:21:47 2013 +0000
@@ -0,0 +1,60 @@
+diff -Naur old/istream.c new/istream.c
+--- istream.c	2011-01-04 20:22:22.000000000 +1100
++++ istream.c	2012-07-04 21:50:51.529661517 +1000
+@@ -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 file_handle_rofl *handle);
++static int file_read(struct file_handle_rofl *handle, char *buf, int len);
+ 
+ static int str_read(Str handle, char *buf, int len);
+ 
+@@ -114,7 +114,7 @@
+     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 file_handle_rofl);
+     stream->file.handle->f = f;
+     if (closep)
+ 	stream->file.handle->close = closep;
+@@ -658,13 +658,13 @@
+ }
+ 
+ static void
+-file_close(struct file_handle *handle)
++file_close(struct file_handle_rofl *handle)
+ {
+     handle->close(handle->f);
+ }
+ 
+ static int
+-file_read(struct file_handle *handle, char *buf, int len)
++file_read(struct file_handle_rofl *handle, char *buf, int len)
+ {
+     return fread(buf, 1, len, handle->f);
+ }
+diff -Naur old/istream.h new/istream.h
+--- istream.h	2003-10-21 02:41:56.000000000 +1000
++++ istream.h	2012-07-04 21:50:51.529661517 +1000
+@@ -20,7 +20,7 @@
+ 
+ typedef struct stream_buffer *StreamBuffer;
+ 
+-struct file_handle {
++struct file_handle_rofl {
+     FILE *f;
+     void (*close) ();
+ };
+@@ -53,7 +53,7 @@
+ 
+ struct file_stream {
+     struct stream_buffer stream;
+-    struct file_handle *handle;
++    struct file_handle_rofl *handle;
+     char type;
+     char iseos;
+     int (*read) ();
diff -r 512c93d7c3b4 -r 65f9b9b388d7 w3m/stuff/https.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/w3m/stuff/https.patch	Fri Mar 15 13:21:47 2013 +0000
@@ -0,0 +1,19 @@
+Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
+
+--- url.c	2011-01-04 14:52:24.000000000 +0530
++++ url.c	2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+     {"ftp", SCM_FTP},
+     {"local", SCM_LOCAL},
+     {"file", SCM_LOCAL},
+-    /*  {"exec", SCM_EXEC}, */
++    {"exec", SCM_EXEC}, 
+     {"nntp", SCM_NNTP},
+-    /*  {"nntp", SCM_NNTP_GROUP}, */
++    {"nntp", SCM_NNTP_GROUP}, 
+     {"news", SCM_NEWS},
+-    /*  {"news", SCM_NEWS_GROUP}, */
++    {"news", SCM_NEWS_GROUP}, 
+     {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+     {"mailto", SCM_MAILTO},
diff -r 512c93d7c3b4 -r 65f9b9b388d7 w3m/stuff/w3m-0.5.2-gc72.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/w3m/stuff/w3m-0.5.2-gc72.patch	Fri Mar 15 13:21:47 2013 +0000
@@ -0,0 +1,27 @@
+diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
+--- main.c	2007-05-31 10:19:50.000000000 +0900
++++ 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 */