SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/w3m/stuff/file_handle.patch	Fri Mar 15 13:21:47 2013 +0000
     1.3 @@ -0,0 +1,60 @@
     1.4 +diff -Naur old/istream.c new/istream.c
     1.5 +--- istream.c	2011-01-04 20:22:22.000000000 +1100
     1.6 ++++ istream.c	2012-07-04 21:50:51.529661517 +1000
     1.7 +@@ -22,8 +22,8 @@
     1.8 + static void basic_close(int *handle);
     1.9 + static int basic_read(int *handle, char *buf, int len);
    1.10 + 
    1.11 +-static void file_close(struct file_handle *handle);
    1.12 +-static int file_read(struct file_handle *handle, char *buf, int len);
    1.13 ++static void file_close(struct file_handle_rofl *handle);
    1.14 ++static int file_read(struct file_handle_rofl *handle, char *buf, int len);
    1.15 + 
    1.16 + static int str_read(Str handle, char *buf, int len);
    1.17 + 
    1.18 +@@ -114,7 +114,7 @@
    1.19 +     stream = New(union input_stream);
    1.20 +     init_base_stream(&stream->base, STREAM_BUF_SIZE);
    1.21 +     stream->file.type = IST_FILE;
    1.22 +-    stream->file.handle = New(struct file_handle);
    1.23 ++    stream->file.handle = New(struct file_handle_rofl);
    1.24 +     stream->file.handle->f = f;
    1.25 +     if (closep)
    1.26 + 	stream->file.handle->close = closep;
    1.27 +@@ -658,13 +658,13 @@
    1.28 + }
    1.29 + 
    1.30 + static void
    1.31 +-file_close(struct file_handle *handle)
    1.32 ++file_close(struct file_handle_rofl *handle)
    1.33 + {
    1.34 +     handle->close(handle->f);
    1.35 + }
    1.36 + 
    1.37 + static int
    1.38 +-file_read(struct file_handle *handle, char *buf, int len)
    1.39 ++file_read(struct file_handle_rofl *handle, char *buf, int len)
    1.40 + {
    1.41 +     return fread(buf, 1, len, handle->f);
    1.42 + }
    1.43 +diff -Naur old/istream.h new/istream.h
    1.44 +--- istream.h	2003-10-21 02:41:56.000000000 +1000
    1.45 ++++ istream.h	2012-07-04 21:50:51.529661517 +1000
    1.46 +@@ -20,7 +20,7 @@
    1.47 + 
    1.48 + typedef struct stream_buffer *StreamBuffer;
    1.49 + 
    1.50 +-struct file_handle {
    1.51 ++struct file_handle_rofl {
    1.52 +     FILE *f;
    1.53 +     void (*close) ();
    1.54 + };
    1.55 +@@ -53,7 +53,7 @@
    1.56 + 
    1.57 + struct file_stream {
    1.58 +     struct stream_buffer stream;
    1.59 +-    struct file_handle *handle;
    1.60 ++    struct file_handle_rofl *handle;
    1.61 +     char type;
    1.62 +     char iseos;
    1.63 +     int (*read) ();

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/w3m/stuff/https.patch	Fri Mar 15 13:21:47 2013 +0000
     2.3 @@ -0,0 +1,19 @@
     2.4 +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
     2.5 +
     2.6 +--- url.c	2011-01-04 14:52:24.000000000 +0530
     2.7 ++++ url.c	2011-09-02 18:25:43.305652690 +0530
     2.8 +@@ -82,11 +82,11 @@
     2.9 +     {"ftp", SCM_FTP},
    2.10 +     {"local", SCM_LOCAL},
    2.11 +     {"file", SCM_LOCAL},
    2.12 +-    /*  {"exec", SCM_EXEC}, */
    2.13 ++    {"exec", SCM_EXEC}, 
    2.14 +     {"nntp", SCM_NNTP},
    2.15 +-    /*  {"nntp", SCM_NNTP_GROUP}, */
    2.16 ++    {"nntp", SCM_NNTP_GROUP}, 
    2.17 +     {"news", SCM_NEWS},
    2.18 +-    /*  {"news", SCM_NEWS_GROUP}, */
    2.19 ++    {"news", SCM_NEWS_GROUP}, 
    2.20 +     {"data", SCM_DATA},
    2.21 + #ifndef USE_W3MMAILER
    2.22 +     {"mailto", SCM_MAILTO},

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/w3m/stuff/w3m-0.5.2-gc72.patch	Fri Mar 15 13:21:47 2013 +0000
     3.3 @@ -0,0 +1,27 @@
     3.4 +diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
     3.5 +--- main.c	2007-05-31 10:19:50.000000000 +0900
     3.6 ++++ main.c	2009-11-09 08:20:02.184953443 +0900
     3.7 +@@ -312,7 +312,11 @@
     3.8 + 	    lock = 0;
     3.9 + 	}
    3.10 +     }
    3.11 ++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
    3.12 ++    else if (orig_GC_warn_proc = GC_get_warn_proc())
    3.13 ++#else
    3.14 +     else if (orig_GC_warn_proc)
    3.15 ++#endif
    3.16 + 	orig_GC_warn_proc(msg, arg);
    3.17 +     else
    3.18 + 	fprintf(stderr, msg, (unsigned long)arg);
    3.19 +@@ -842,7 +846,11 @@
    3.20 +     mySignal(SIGPIPE, SigPipe);
    3.21 + #endif
    3.22 + 
    3.23 ++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
    3.24 ++    GC_set_warn_proc(wrap_GC_warn_proc);
    3.25 ++#else
    3.26 +     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
    3.27 ++#endif
    3.28 +     err_msg = Strnew();
    3.29 +     if (load_argc == 0) {
    3.30 + 	/* no URL specified */