diff options
| -rw-r--r-- | debian/patches/070_glibc2.14.patch | 63 | ||||
| -rw-r--r-- | debian/patches/series | 1 | 
2 files changed, 64 insertions, 0 deletions
| diff --git a/debian/patches/070_glibc2.14.patch b/debian/patches/070_glibc2.14.patch new file mode 100644 index 0000000..25e480a --- /dev/null +++ b/debian/patches/070_glibc2.14.patch @@ -0,0 +1,63 @@ +Description: Unbreak compilation with eglibc 2.14 +Author: Reinhard Tartler <siretart@tauware.de> +Origin: Ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/935540 + +--- w3m-0.5.3.orig/istream.c ++++ w3m-0.5.3/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 io_file_handle *handle); ++static int file_read(struct io_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 io_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 l + } +  + static void +-file_close(struct file_handle *handle) ++file_close(struct io_file_handle *handle) + { +     handle->close(handle->f); + } +  + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct io_file_handle *handle, char *buf, int len) + { +     return fread(buf, 1, len, handle->f); + } +--- w3m-0.5.3.orig/istream.h ++++ w3m-0.5.3/istream.h +@@ -20,7 +20,7 @@ struct stream_buffer { +  + typedef struct stream_buffer *StreamBuffer; +  +-struct file_handle { ++struct io_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 io_file_handle *handle; +     char type; +     char iseos; +     int (*read) (); diff --git a/debian/patches/series b/debian/patches/series index 71b0d9c..b247235 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@  040_link_gcc45.patch  050_entity-h-clean.patch  060_format-security.patch +070_glibc2.14.patch | 
