Date: Tuesday, November 10, 2015 @ 17:46:47 Author: bisson Revision: 250552
switch upstream to debian Modified: w3m/trunk/PKGBUILD Deleted: w3m/trunk/color.patch w3m/trunk/file_handle.patch w3m/trunk/form_unknown.patch w3m/trunk/gc72.patch w3m/trunk/https.patch w3m/trunk/perl.patch --------------------+ PKGBUILD | 36 ++++++------------------------ color.patch | 44 ------------------------------------- file_handle.patch | 60 --------------------------------------------------- form_unknown.patch | 15 ------------ gc72.patch | 13 ----------- https.patch | 19 ---------------- perl.patch | 12 ---------- 7 files changed, 8 insertions(+), 191 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-10 14:08:13 UTC (rev 250551) +++ PKGBUILD 2015-11-10 16:46:47 UTC (rev 250552) @@ -3,38 +3,20 @@ # Contributor: dorphell <dorph...@archlinux.org> pkgname=w3m -pkgver=0.5.3 -pkgrel=10 +pkgver=0.5.3.git20151109 +pkgrel=1 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') arch=('i686' 'x86_64') -makedepends=('imlib2') +makedepends=('git' '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' - 'color.patch' - 'perl.patch' - 'gc72.patch') -sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' - '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2' - '457de43be7eabc652614461a7ab25e3ba76b2aff' - '66affb2f695fe0bdde25cf774642bfd6a9404e88' - '9c30038c7672508a93e55044248b29ed572cc13e' - 'a8fb1f738688104ad8f0713bd981083e12e878ad' - '7baa06ca684fd140503a2adc65e2d606970c4662') +depends=('openssl' 'gc' 'ncurses' 'gpm') +source=("git://anonscm.debian.org/collab-maint/w3m.git#commit=331e29e32bb5e7e06c7c1ed03c7465e08c744b07") +sha1sums=('SKIP') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - ls ../*.patch | xargs -i patch -p1 -i {} -} - build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LIBS="-lX11" + cd "${srcdir}/${pkgname}" ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -42,14 +24,12 @@ --with-imagelib=imlib2 \ --with-termlib=ncurses \ --disable-w3mmailer \ - --disable-mouse \ - sed 's/@my_libs@/-lX11/g' -i Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" Deleted: color.patch =================================================================== --- color.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ color.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -1,44 +0,0 @@ ---- a/w3mimg/x11/x11_w3mimg.c 2004-11-08 12:14:06.000000000 -0500 -+++ b/w3mimg/x11/x11_w3mimg.c 2015-03-12 23:23:44.964555734 -0400 -@@ -214,9 +214,12 @@ - Pixmap p; - GC gc; - XImage *i; -+ XWindowAttributes attr; -+ -+ XGetWindowAttributes(xi->display, xi->window, &attr); - - p = XCreatePixmap(xi->display, xi->window, 1, 1, -- DefaultDepth(xi->display, 0)); -+ attr.depth); - gc = XCreateGC(xi->display, xi->window, 0, NULL); - if (!p || !gc) - exit(1); /* XXX */ -@@ -328,6 +331,7 @@ - ImlibImage *im; - #elif defined(USE_IMLIB2) - Imlib_Image im; -+ XWindowAttributes attr; - #elif defined(USE_GDKPIXBUF) - GdkPixbufAnimation *animation; - int j, iw, ih, n, frame_num, delay = -1, max_anim; -@@ -374,15 +378,16 @@ - w = imlib_image_get_width(); - if (h <= 0) - h = imlib_image_get_height(); -+ XGetWindowAttributes(xi->display, xi->window, &attr); - img->pixmap = (void *)XCreatePixmap(xi->display, xi->parent, w, h, -- DefaultDepth(xi->display, 0)); -+ attr.depth); - if (!img->pixmap) - return 0; - XSetForeground(xi->display, xi->imageGC, xi->background_pixel); - XFillRectangle(xi->display, (Pixmap) img->pixmap, xi->imageGC, 0, 0, w, h); - imlib_context_set_display(xi->display); -- imlib_context_set_visual(DefaultVisual(xi->display, 0)); -- imlib_context_set_colormap(DefaultColormap(xi->display, 0)); -+ imlib_context_set_visual(attr.visual); -+ imlib_context_set_colormap(attr.colormap); - imlib_context_set_drawable((Drawable) img->pixmap); - imlib_render_image_on_drawable_at_size(0, 0, w, h); - imlib_free_image(); Deleted: file_handle.patch =================================================================== --- file_handle.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ file_handle.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -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) (); Deleted: form_unknown.patch =================================================================== --- form_unknown.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ form_unknown.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -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 Deleted: gc72.patch =================================================================== --- gc72.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ gc72.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -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 */ Deleted: https.patch =================================================================== --- https.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ https.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -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}, Deleted: perl.patch =================================================================== --- perl.patch 2015-11-10 14:08:13 UTC (rev 250551) +++ perl.patch 2015-11-10 16:46:47 UTC (rev 250552) @@ -1,12 +0,0 @@ -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; - } - }
