packages: w3m/w3m.spec, w3m/w3m-0.5.2-fix_gcc_error.patch (NEW), w3m/w3m-0....

[arekm]

Author: arekm                        Date: Thu Sep  1 17:20:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix build

---- Files affected:
packages/w3m:
   w3m.spec (1.70 -> 1.71) , w3m-0.5.2-fix_gcc_error.patch (NONE -> 1.1)  (NEW), w3m-0.5.3-parallel-make.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/w3m/w3m.spec
diff -u packages/w3m/w3m.spec:1.70 packages/w3m/w3m.spec:1.71
--- packages/w3m/w3m.spec:1.70	Thu Sep  1 19:03:28 2011
+++ packages/w3m/w3m.spec	Thu Sep  1 19:20:05 2011
@@ -8,7 +8,7 @@
 Summary(tr.UTF-8):	Metin ekranda WWW tarayıcı
 Name:		w3m
 Version:	0.5.3
-Release:	2
+Release:	3
 Epoch:		1
 License:	MIT-like
 Group:		Applications/Networking
@@ -16,6 +16,8 @@
 # Source0-md5:	1b845a983a50b8dec0169ac48479eacc
 Patch0:		%{name}-gzip_fallback.patch
 Patch1:		%{name}-nolibs.patch
+Patch2:		w3m-0.5.3-parallel-make.patch
+Patch3:		w3m-0.5.2-fix_gcc_error.patch
 URL:		http://w3m.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -82,6 +84,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %{__sed} '/^AC_PROG_CXX$/d' -i configure.ac
 
@@ -148,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2011/09/01 17:20:05  arekm
+- rel 3; fix build
+
 Revision 1.70  2011/09/01 17:03:28  arekm
 - release 2
 

================================================================
Index: packages/w3m/w3m-0.5.2-fix_gcc_error.patch
diff -u /dev/null packages/w3m/w3m-0.5.2-fix_gcc_error.patch:1.1
--- /dev/null	Thu Sep  1 19:20:10 2011
+++ packages/w3m/w3m-0.5.2-fix_gcc_error.patch	Thu Sep  1 19:20:05 2011
@@ -0,0 +1,60 @@
+diff -urNp w3m-0.5.2/istream.c w3m-0.5.2-glibc/istream.c
+--- w3m-0.5.2/istream.c	2011-06-27 09:00:48.753053138 +0530
++++ w3m-0.5.2-glibc/istream.c	2011-06-27 09:13:01.419642857 +0530
+@@ -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);
+ }
+diff -urNp w3m-0.5.2/istream.h w3m-0.5.2-glibc/istream.h
+--- w3m-0.5.2/istream.h	2003-10-20 22:11:56.000000000 +0530
++++ w3m-0.5.2-glibc/istream.h	2011-06-27 08:49:14.175900216 +0530
+@@ -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) ();

================================================================
Index: packages/w3m/w3m-0.5.3-parallel-make.patch
diff -u /dev/null packages/w3m/w3m-0.5.3-parallel-make.patch:1.1
--- /dev/null	Thu Sep  1 19:20:10 2011
+++ packages/w3m/w3m-0.5.3-parallel-make.patch	Thu Sep  1 19:20:05 2011
@@ -0,0 +1,12 @@
+diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
+--- w3m-0.5.3.orig/w3mimg/Makefile.in	2011-01-04 18:22:28.000000000 +0900
++++ w3m-0.5.3/w3mimg/Makefile.in	2011-02-02 11:35:47.725076601 +0900
+@@ -22,6 +22,8 @@
+ 	$(AR) rv $@ $(IMGOBJS)
+ 	$(RANLIB) $@
+ 
++$(IMGOBJS): @IMGTARGETS@
++
+ w3mimg.o: w3mimg.c
+ 	$(CC) $(CFLAGS) -c $<
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w3m/w3m.spec?r1=1.70&r2=1.71&f=u