Date: Saturday, July 11, 2015 @ 04:59:47 Author: bisson Revision: 242108
archrelease: copy trunk to extra-i686, extra-x86_64 Added: w3m/repos/extra-i686/PKGBUILD (from rev 242107, w3m/trunk/PKGBUILD) w3m/repos/extra-i686/file_handle.patch (from rev 242107, w3m/trunk/file_handle.patch) w3m/repos/extra-i686/form_unknown.patch (from rev 242107, w3m/trunk/form_unknown.patch) w3m/repos/extra-i686/gc72.patch (from rev 242107, w3m/trunk/gc72.patch) w3m/repos/extra-i686/https.patch (from rev 242107, w3m/trunk/https.patch) w3m/repos/extra-i686/perl.patch (from rev 242107, w3m/trunk/perl.patch) w3m/repos/extra-x86_64/PKGBUILD (from rev 242107, w3m/trunk/PKGBUILD) w3m/repos/extra-x86_64/file_handle.patch (from rev 242107, w3m/trunk/file_handle.patch) w3m/repos/extra-x86_64/form_unknown.patch (from rev 242107, w3m/trunk/form_unknown.patch) w3m/repos/extra-x86_64/gc72.patch (from rev 242107, w3m/trunk/gc72.patch) w3m/repos/extra-x86_64/https.patch (from rev 242107, w3m/trunk/https.patch) w3m/repos/extra-x86_64/perl.patch (from rev 242107, w3m/trunk/perl.patch) Deleted: w3m/repos/extra-i686/PKGBUILD w3m/repos/extra-i686/file_handle.patch w3m/repos/extra-i686/form_unknown.patch w3m/repos/extra-i686/gc72.patch w3m/repos/extra-i686/https.patch w3m/repos/extra-x86_64/PKGBUILD w3m/repos/extra-x86_64/file_handle.patch w3m/repos/extra-x86_64/form_unknown.patch w3m/repos/extra-x86_64/gc72.patch w3m/repos/extra-x86_64/https.patch ---------------------------------+ /PKGBUILD | 112 +++++++++++++++++++++++++++++++++++ /file_handle.patch | 120 ++++++++++++++++++++++++++++++++++++++ /form_unknown.patch | 30 +++++++++ /gc72.patch | 26 ++++++++ /https.patch | 38 ++++++++++++ extra-i686/PKGBUILD | 54 ----------------- extra-i686/file_handle.patch | 60 ------------------- extra-i686/form_unknown.patch | 15 ---- extra-i686/gc72.patch | 13 ---- extra-i686/https.patch | 19 ------ extra-i686/perl.patch | 12 +++ extra-x86_64/PKGBUILD | 54 ----------------- extra-x86_64/file_handle.patch | 60 ------------------- extra-x86_64/form_unknown.patch | 15 ---- extra-x86_64/gc72.patch | 13 ---- extra-x86_64/https.patch | 19 ------ extra-x86_64/perl.patch | 12 +++ 17 files changed, 350 insertions(+), 322 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-i686/PKGBUILD 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=w3m -pkgver=0.5.3 -pkgrel=7 -pkgdesc='Text-based Web browser, as well as pager' -url='http://w3m.sourceforge.net/' -license=('custom') -arch=('i686' 'x86_64') -makedepends=('imlib2') -optdepends=('imlib2: for graphics support') -depends=('openssl' 'gc' 'ncurses') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'form_unknown.patch' - 'file_handle.patch' - 'https.patch' - 'gc72.patch') -sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' - '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' - '457de43be7eabc652614461a7ab25e3ba76b2aff' - '66affb2f695fe0bdde25cf774642bfd6a9404e88' - '7baa06ca684fd140503a2adc65e2d606970c4662') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - ls ../*.patch | xargs -i patch -p1 -i {} -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBS="-lX11" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --enable-image=x11,fb \ - --with-imagelib=imlib2 \ - --with-termlib=ncurses \ - --disable-w3mmailer \ - --disable-mouse \ - - sed 's/@my_libs@/-lX11/g' -i Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" - ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" -} Copied: w3m/repos/extra-i686/PKGBUILD (from rev 242107, w3m/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=w3m +pkgver=0.5.3 +pkgrel=8 +pkgdesc='Text-based Web browser, as well as pager' +url='http://w3m.sourceforge.net/' +license=('custom') +arch=('i686' 'x86_64') +makedepends=('imlib2') +optdepends=('imlib2: for graphics support') +depends=('openssl' 'gc' 'ncurses') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'form_unknown.patch' + 'file_handle.patch' + 'https.patch' + 'perl.patch' + 'gc72.patch') +sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' + '457de43be7eabc652614461a7ab25e3ba76b2aff' + '66affb2f695fe0bdde25cf774642bfd6a9404e88' + 'a8fb1f738688104ad8f0713bd981083e12e878ad' + '7baa06ca684fd140503a2adc65e2d606970c4662') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + ls ../*.patch | xargs -i patch -p1 -i {} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LIBS="-lX11" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-image=x11,fb \ + --with-imagelib=imlib2 \ + --with-termlib=ncurses \ + --disable-w3mmailer \ + --disable-mouse \ + + sed 's/@my_libs@/-lX11/g' -i Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" + ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" +} Deleted: extra-i686/file_handle.patch =================================================================== --- extra-i686/file_handle.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-i686/file_handle.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,60 +0,0 @@ -diff -Naur old/istream.c new/istream.c ---- old/istream.c 2011-01-04 20:22:22.000000000 +1100 -+++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 -@@ -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 file_handle_rofl *handle); -+static int file_read(struct file_handle_rofl *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 file_handle_rofl); - 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 file_handle_rofl *handle) - { - handle->close(handle->f); - } - - static int --file_read(struct file_handle *handle, char *buf, int len) -+file_read(struct file_handle_rofl *handle, char *buf, int len) - { - return fread(buf, 1, len, handle->f); - } -diff -Naur old/istream.h new/istream.h ---- old/istream.h 2003-10-21 02:41:56.000000000 +1000 -+++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 -@@ -20,7 +20,7 @@ - - typedef struct stream_buffer *StreamBuffer; - --struct file_handle { -+struct file_handle_rofl { - FILE *f; - void (*close) (); - }; -@@ -53,7 +53,7 @@ - - struct file_stream { - struct stream_buffer stream; -- struct file_handle *handle; -+ struct file_handle_rofl *handle; - char type; - char iseos; - int (*read) (); Copied: w3m/repos/extra-i686/file_handle.patch (from rev 242107, w3m/trunk/file_handle.patch) =================================================================== --- extra-i686/file_handle.patch (rev 0) +++ extra-i686/file_handle.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,60 @@ +diff -Naur old/istream.c new/istream.c +--- old/istream.c 2011-01-04 20:22:22.000000000 +1100 ++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 +@@ -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 file_handle_rofl *handle); ++static int file_read(struct file_handle_rofl *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 file_handle_rofl); + 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 file_handle_rofl *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct file_handle_rofl *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +diff -Naur old/istream.h new/istream.h +--- old/istream.h 2003-10-21 02:41:56.000000000 +1000 ++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct file_handle_rofl { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct file_handle_rofl *handle; + char type; + char iseos; + int (*read) (); Deleted: extra-i686/form_unknown.patch =================================================================== --- extra-i686/form_unknown.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-i686/form_unknown.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,15 +0,0 @@ -See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843 - -Index: w3m-git/form.c -=================================================================== ---- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100 -+++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100 -@@ -196,7 +196,7 @@ - if (!strcasecmp(typestr, _formtypetbl[i])) - return i; - } -- return FORM_UNKNOWN; -+ return FORM_INPUT_TEXT; - } - - void Copied: w3m/repos/extra-i686/form_unknown.patch (from rev 242107, w3m/trunk/form_unknown.patch) =================================================================== --- extra-i686/form_unknown.patch (rev 0) +++ extra-i686/form_unknown.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,15 @@ +See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843 + +Index: w3m-git/form.c +=================================================================== +--- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100 ++++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100 +@@ -196,7 +196,7 @@ + if (!strcasecmp(typestr, _formtypetbl[i])) + return i; + } +- return FORM_UNKNOWN; ++ return FORM_INPUT_TEXT; + } + + void Deleted: extra-i686/gc72.patch =================================================================== --- extra-i686/gc72.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-i686/gc72.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,13 +0,0 @@ -diff -Naur old/main.c new/main.c ---- old/main.c 2011-01-04 20:42:19.000000000 +1100 -+++ new/main.c 2012-07-04 21:49:10.136212236 +1000 -@@ -833,7 +833,8 @@ - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ orig_GC_warn_proc = GC_get_warn_proc(); -+ GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ Copied: w3m/repos/extra-i686/gc72.patch (from rev 242107, w3m/trunk/gc72.patch) =================================================================== --- extra-i686/gc72.patch (rev 0) +++ extra-i686/gc72.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,13 @@ +diff -Naur old/main.c new/main.c +--- old/main.c 2011-01-04 20:42:19.000000000 +1100 ++++ new/main.c 2012-07-04 21:49:10.136212236 +1000 +@@ -833,7 +833,8 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ Deleted: extra-i686/https.patch =================================================================== --- extra-i686/https.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-i686/https.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,19 +0,0 @@ -Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 - ---- old/url.c 2011-01-04 14:52:24.000000000 +0530 -+++ new/url.c 2011-09-02 18:25:43.305652690 +0530 -@@ -82,11 +82,11 @@ - {"ftp", SCM_FTP}, - {"local", SCM_LOCAL}, - {"file", SCM_LOCAL}, -- /* {"exec", SCM_EXEC}, */ -+ {"exec", SCM_EXEC}, - {"nntp", SCM_NNTP}, -- /* {"nntp", SCM_NNTP_GROUP}, */ -+ {"nntp", SCM_NNTP_GROUP}, - {"news", SCM_NEWS}, -- /* {"news", SCM_NEWS_GROUP}, */ -+ {"news", SCM_NEWS_GROUP}, - {"data", SCM_DATA}, - #ifndef USE_W3MMAILER - {"mailto", SCM_MAILTO}, Copied: w3m/repos/extra-i686/https.patch (from rev 242107, w3m/trunk/https.patch) =================================================================== --- extra-i686/https.patch (rev 0) +++ extra-i686/https.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, Copied: w3m/repos/extra-i686/perl.patch (from rev 242107, w3m/trunk/perl.patch) =================================================================== --- extra-i686/perl.patch (rev 0) +++ extra-i686/perl.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,12 @@ +diff -Naur old/scripts/w3mhelp.cgi.in new/scripts/w3mhelp.cgi.in +--- old/scripts/w3mhelp.cgi.in 2011-01-03 23:22:28.000000000 -1000 ++++ new/scripts/w3mhelp.cgi.in 2015-07-10 16:50:25.520506820 -1000 +@@ -48,7 +48,7 @@ + } + # print "tlang=$tlang\n"; + eval {require "w3mhelp-funcdesc.$tlang.pl";}; +- if (defined(%funcdesc)) { ++ if (%funcdesc) { + $lang = $tlang; + } + } Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-x86_64/PKGBUILD 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=w3m -pkgver=0.5.3 -pkgrel=7 -pkgdesc='Text-based Web browser, as well as pager' -url='http://w3m.sourceforge.net/' -license=('custom') -arch=('i686' 'x86_64') -makedepends=('imlib2') -optdepends=('imlib2: for graphics support') -depends=('openssl' 'gc' 'ncurses') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'form_unknown.patch' - 'file_handle.patch' - 'https.patch' - 'gc72.patch') -sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' - '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' - '457de43be7eabc652614461a7ab25e3ba76b2aff' - '66affb2f695fe0bdde25cf774642bfd6a9404e88' - '7baa06ca684fd140503a2adc65e2d606970c4662') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - ls ../*.patch | xargs -i patch -p1 -i {} -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBS="-lX11" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --enable-image=x11,fb \ - --with-imagelib=imlib2 \ - --with-termlib=ncurses \ - --disable-w3mmailer \ - --disable-mouse \ - - sed 's/@my_libs@/-lX11/g' -i Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" - ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" -} Copied: w3m/repos/extra-x86_64/PKGBUILD (from rev 242107, w3m/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=w3m +pkgver=0.5.3 +pkgrel=8 +pkgdesc='Text-based Web browser, as well as pager' +url='http://w3m.sourceforge.net/' +license=('custom') +arch=('i686' 'x86_64') +makedepends=('imlib2') +optdepends=('imlib2: for graphics support') +depends=('openssl' 'gc' 'ncurses') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'form_unknown.patch' + 'file_handle.patch' + 'https.patch' + 'perl.patch' + 'gc72.patch') +sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' + '457de43be7eabc652614461a7ab25e3ba76b2aff' + '66affb2f695fe0bdde25cf774642bfd6a9404e88' + 'a8fb1f738688104ad8f0713bd981083e12e878ad' + '7baa06ca684fd140503a2adc65e2d606970c4662') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + ls ../*.patch | xargs -i patch -p1 -i {} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LIBS="-lX11" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-image=x11,fb \ + --with-imagelib=imlib2 \ + --with-termlib=ncurses \ + --disable-w3mmailer \ + --disable-mouse \ + + sed 's/@my_libs@/-lX11/g' -i Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" + ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" +} Deleted: extra-x86_64/file_handle.patch =================================================================== --- extra-x86_64/file_handle.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-x86_64/file_handle.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,60 +0,0 @@ -diff -Naur old/istream.c new/istream.c ---- old/istream.c 2011-01-04 20:22:22.000000000 +1100 -+++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 -@@ -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 file_handle_rofl *handle); -+static int file_read(struct file_handle_rofl *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 file_handle_rofl); - 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 file_handle_rofl *handle) - { - handle->close(handle->f); - } - - static int --file_read(struct file_handle *handle, char *buf, int len) -+file_read(struct file_handle_rofl *handle, char *buf, int len) - { - return fread(buf, 1, len, handle->f); - } -diff -Naur old/istream.h new/istream.h ---- old/istream.h 2003-10-21 02:41:56.000000000 +1000 -+++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 -@@ -20,7 +20,7 @@ - - typedef struct stream_buffer *StreamBuffer; - --struct file_handle { -+struct file_handle_rofl { - FILE *f; - void (*close) (); - }; -@@ -53,7 +53,7 @@ - - struct file_stream { - struct stream_buffer stream; -- struct file_handle *handle; -+ struct file_handle_rofl *handle; - char type; - char iseos; - int (*read) (); Copied: w3m/repos/extra-x86_64/file_handle.patch (from rev 242107, w3m/trunk/file_handle.patch) =================================================================== --- extra-x86_64/file_handle.patch (rev 0) +++ extra-x86_64/file_handle.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,60 @@ +diff -Naur old/istream.c new/istream.c +--- old/istream.c 2011-01-04 20:22:22.000000000 +1100 ++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 +@@ -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 file_handle_rofl *handle); ++static int file_read(struct file_handle_rofl *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 file_handle_rofl); + 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 file_handle_rofl *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct file_handle_rofl *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +diff -Naur old/istream.h new/istream.h +--- old/istream.h 2003-10-21 02:41:56.000000000 +1000 ++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct file_handle_rofl { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct file_handle_rofl *handle; + char type; + char iseos; + int (*read) (); Deleted: extra-x86_64/form_unknown.patch =================================================================== --- extra-x86_64/form_unknown.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-x86_64/form_unknown.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,15 +0,0 @@ -See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843 - -Index: w3m-git/form.c -=================================================================== ---- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100 -+++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100 -@@ -196,7 +196,7 @@ - if (!strcasecmp(typestr, _formtypetbl[i])) - return i; - } -- return FORM_UNKNOWN; -+ return FORM_INPUT_TEXT; - } - - void Copied: w3m/repos/extra-x86_64/form_unknown.patch (from rev 242107, w3m/trunk/form_unknown.patch) =================================================================== --- extra-x86_64/form_unknown.patch (rev 0) +++ extra-x86_64/form_unknown.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,15 @@ +See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843 + +Index: w3m-git/form.c +=================================================================== +--- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100 ++++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100 +@@ -196,7 +196,7 @@ + if (!strcasecmp(typestr, _formtypetbl[i])) + return i; + } +- return FORM_UNKNOWN; ++ return FORM_INPUT_TEXT; + } + + void Deleted: extra-x86_64/gc72.patch =================================================================== --- extra-x86_64/gc72.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-x86_64/gc72.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,13 +0,0 @@ -diff -Naur old/main.c new/main.c ---- old/main.c 2011-01-04 20:42:19.000000000 +1100 -+++ new/main.c 2012-07-04 21:49:10.136212236 +1000 -@@ -833,7 +833,8 @@ - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ orig_GC_warn_proc = GC_get_warn_proc(); -+ GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ Copied: w3m/repos/extra-x86_64/gc72.patch (from rev 242107, w3m/trunk/gc72.patch) =================================================================== --- extra-x86_64/gc72.patch (rev 0) +++ extra-x86_64/gc72.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,13 @@ +diff -Naur old/main.c new/main.c +--- old/main.c 2011-01-04 20:42:19.000000000 +1100 ++++ new/main.c 2012-07-04 21:49:10.136212236 +1000 +@@ -833,7 +833,8 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ Deleted: extra-x86_64/https.patch =================================================================== --- extra-x86_64/https.patch 2015-07-11 02:58:49 UTC (rev 242107) +++ extra-x86_64/https.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -1,19 +0,0 @@ -Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 - ---- old/url.c 2011-01-04 14:52:24.000000000 +0530 -+++ new/url.c 2011-09-02 18:25:43.305652690 +0530 -@@ -82,11 +82,11 @@ - {"ftp", SCM_FTP}, - {"local", SCM_LOCAL}, - {"file", SCM_LOCAL}, -- /* {"exec", SCM_EXEC}, */ -+ {"exec", SCM_EXEC}, - {"nntp", SCM_NNTP}, -- /* {"nntp", SCM_NNTP_GROUP}, */ -+ {"nntp", SCM_NNTP_GROUP}, - {"news", SCM_NEWS}, -- /* {"news", SCM_NEWS_GROUP}, */ -+ {"news", SCM_NEWS_GROUP}, - {"data", SCM_DATA}, - #ifndef USE_W3MMAILER - {"mailto", SCM_MAILTO}, Copied: w3m/repos/extra-x86_64/https.patch (from rev 242107, w3m/trunk/https.patch) =================================================================== --- extra-x86_64/https.patch (rev 0) +++ extra-x86_64/https.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, Copied: w3m/repos/extra-x86_64/perl.patch (from rev 242107, w3m/trunk/perl.patch) =================================================================== --- extra-x86_64/perl.patch (rev 0) +++ extra-x86_64/perl.patch 2015-07-11 02:59:47 UTC (rev 242108) @@ -0,0 +1,12 @@ +diff -Naur old/scripts/w3mhelp.cgi.in new/scripts/w3mhelp.cgi.in +--- old/scripts/w3mhelp.cgi.in 2011-01-03 23:22:28.000000000 -1000 ++++ new/scripts/w3mhelp.cgi.in 2015-07-10 16:50:25.520506820 -1000 +@@ -48,7 +48,7 @@ + } + # print "tlang=$tlang\n"; + eval {require "w3mhelp-funcdesc.$tlang.pl";}; +- if (defined(%funcdesc)) { ++ if (%funcdesc) { + $lang = $tlang; + } + }