You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
81 lines
2.5 KiB
81 lines
2.5 KiB
13 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../w3m/w3m-0.5.3-glibc214.patch
|
||
|
|
# Copyright (C) 2012 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Fix build with glibc-2.14
|
||
|
|
|
||
|
|
original patch from gentoo linux
|
||
|
|
|
||
|
|
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.3-glibc214.patch?revision=1.1
|
||
|
|
|
||
|
|
--- a/istream.c 2011-01-04 18:22:22.000000000 +0900
|
||
|
|
+++ b/istream.c 2011-06-24 08:15:23.522990618 +0900
|
||
|
|
@@ -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 afile_handle *handle);
|
||
|
|
+static int file_read(struct afile_handle *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 afile_handle);
|
||
|
|
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 afile_handle *handle)
|
||
|
|
{
|
||
|
|
handle->close(handle->f);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int
|
||
|
|
-file_read(struct file_handle *handle, char *buf, int len)
|
||
|
|
+file_read(struct afile_handle *handle, char *buf, int len)
|
||
|
|
{
|
||
|
|
return fread(buf, 1, len, handle->f);
|
||
|
|
}
|
||
|
|
--- a/istream.h 2003-10-21 01:41:56.000000000 +0900
|
||
|
|
+++ b/istream.h 2011-06-24 08:15:54.392991144 +0900
|
||
|
|
@@ -20,7 +20,7 @@
|
||
|
|
|
||
|
|
typedef struct stream_buffer *StreamBuffer;
|
||
|
|
|
||
|
|
-struct file_handle {
|
||
|
|
+struct afile_handle {
|
||
|
|
FILE *f;
|
||
|
|
void (*close) ();
|
||
|
|
};
|
||
|
|
@@ -53,7 +53,7 @@
|
||
|
|
|
||
|
|
struct file_stream {
|
||
|
|
struct stream_buffer stream;
|
||
|
|
- struct file_handle *handle;
|
||
|
|
+ struct afile_handle *handle;
|
||
|
|
char type;
|
||
|
|
char iseos;
|
||
|
|
int (*read) ();
|