Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at Mon Sep 5 17:56:50 CEST 2011.
-------- --- w3m/w3m.changes 2011-05-20 16:06:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/w3m/w3m.changes 2011-08-30 20:00:41.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 30 17:59:53 UTC 2011 - crrodrig...@opensuse.org + +- Fix build error: redefinition of 'struct file_handle' + +------------------------------------------------------------------- +Sat Jul 30 23:09:55 UTC 2011 - crrodrig...@opensuse.org + +- Use ncursesw6 instead of old ncurses5 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- w3m-fh-def.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.SKtX4m/_old 2011-09-05 17:55:42.000000000 +0200 +++ /var/tmp/diff_new_pack.SKtX4m/_new 2011-09-05 17:55:42.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: gcc-c++ gpm imlib2-devel ncurses-devel openssl-devel pkgconfig Url: http://w3m.sourceforge.net/ Version: 0.5.3 -Release: 135 +Release: 137 Summary: A text-based WWW browser License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Web/Browsers @@ -47,6 +47,7 @@ Patch500: gc-gcc4.patch Patch501: gc-configure.patch Patch502: gc-arm.patch +Patch503: w3m-fh-def.patch %package inline-image License: BSD3c(or similar) ; MIT License (or similar) @@ -98,19 +99,22 @@ %patch9 -p1 %patch11 %patch12 +%patch503 cd ../gc* %patch500 %patch501 %patch502 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -DUSE_BUFINFO -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -DUSE_BUFINFO -fno-strict-aliasing `ncursesw6-config --cflags`" pushd ../gc* ./configure --prefix=/usr --disable-shared --disable-threads make make install DESTDIR=$RPM_BUILD_DIR/gc_install popd +export LDFLAGS="`ncursesw6-config --libs`" ./configure --bindir=/usr/bin \ + --with-termlib=ncursesw \ --mandir=%_mandir \ --libdir=%_libdir \ --libexecdir=%_libdir \ ++++++ w3m-fh-def.patch ++++++ --- istream.c.orig +++ 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 w3m_file_handle *handle); +static int file_read(struct w3m_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 w3m_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 w3m_file_handle *handle) { handle->close(handle->f); } static int -file_read(struct file_handle *handle, char *buf, int len) +file_read(struct w3m_file_handle *handle, char *buf, int len) { return fread(buf, 1, len, handle->f); } --- istream.h.orig +++ istream.h @@ -20,7 +20,7 @@ struct stream_buffer { typedef struct stream_buffer *StreamBuffer; -struct file_handle { +struct w3m_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 w3m_file_handle *handle; char type; char iseos; int (*read) (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
