Merge lp:~iheino+ub/ubuntu/maverick/w3m/bug683337 into lp:ubuntu/maverick/w3m

[Tuomas Heino]

Fix lp#683337 by backporting 020_button.patch from natty.

TEST CASE:
Log in to launchpad with w3m. Without the fix continue-button will not work.

[Artur Rona (ari-tczew)]

1) Please improve entry in debian/changelog to:

  * debian/091_button.patch:
    - Support the button element as defined in HTML 4.01.
      Backport of 020_button.patch from natty.
      (LP: #683337, Closes: #136810)

1.1) Change target to maverick-proposed in debian/changelog

2) Rename 020_button.patch to 091_button.patch

3) Add following DEP3 tags to patch:
From: Tuomas Heino <email address hidden>
Bug-Ubuntu: https://launchpad.net/bugs/683337

[Artur Rona (ari-tczew)]

> (...)
Of course it was 'Needs-fixing'.

review: Needs Fixing

[lp:~iheino+ub/ubuntu/maverick/w3m/bug683337]

17. By Tuomas Heino on 2011-01-17

  * debian/patches/091_button.patch:
    - Support the button element as defined in HTML 4.01.
      Backport of 020_button.patch from natty.
      (LP: #683337, Closes: #136810)

[Artur Rona (ari-tczew)]

Patches are not the same.
your branch: http://bazaar.launchpad.net/~iheino+ub/ubuntu/maverick/w3m/bug683337/view/head:/debian/patches/091_button.patch
natty: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/natty/w3m/natty/view/head:/debian/patches/020_button.patch

review: Needs Fixing

[Artur Rona (ari-tczew)]

Also please run script 'update-maintainer' from package ubuntu-dev-tools.
https://wiki.ubuntu.com/DebianMaintainerField

review: Needs Fixing

[lp:~iheino+ub/ubuntu/maverick/w3m/bug683337]

18. By Tuomas Heino on 2011-01-18

update-maintainer applied

[Artur Rona (ari-tczew)]

I have debated with Martin Pitt about your patch and unfortunately, it can't be approved. It's small new feature, no bug-fix. This is way through backports.
https://help.ubuntu.com/community/UbuntuBackports

Shortly:
1) Upload package from natty to your PPA without any changes for source;
2) Test package from natty on your maverick;
3) Open bug against maverick-backports and give feedback from testing.

If you have more questions, feel free to get in touch with us on #ubuntu-motu.

review: Disapprove

[Colin Watson (cjwatson)]

We discussed this in the Technical Board meeting of 2011-03-10 (logs: http://irclogs.ubuntu.com/2011/03/10/%23ubuntu-meeting.html), and agreed that this falls under the general precedent set by https://lists.ubuntu.com/archives/ubuntu-devel-announce/2009-March/000550.html: although this introduces a new feature, it's impelled by an external event (a change in how Launchpad handles authentication). As such, there is no need for this to go through -backports.

Your patch looks fine to me; I'll give it some testing, and merge and upload it if it works for me.

[Colin Watson (cjwatson)]

I've merged into a private branch and uploaded. Once it's been accepted into maverick-proposed, I'll be able to push to lp:ubuntu/maverick-proposed/w3m.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-07 00:10:09 +0000
+++ debian/changelog	2011-01-18 10:55:22 +0000
@@ -1,3 +1,12 @@
+w3m (0.5.2-6ubuntu1) maverick-proposed; urgency=low
+
+  * debian/patches/091_button.patch:
+    - Support the button element as defined in HTML 4.01.
+      Backport of 020_button.patch from natty.
+      (LP: #683337, Closes: #136810)
+
+ -- Tuomas Heino <[e-mail]>  Mon, 17 Jan 2011 09:57:32 +0200
+
 w3m (0.5.2-6) unstable; urgency=low
 
   * debian/patches/070_form-update.patch: Patch to fix a problem of

=== modified file 'debian/control'
--- debian/control	2010-07-07 00:10:09 +0000
+++ debian/control	2011-01-18 10:55:22 +0000
@@ -1,7 +1,8 @@
 Source: w3m
 Section: web
 Priority: standard
-Maintainer: Tatsuya Kinoshita <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Tatsuya Kinoshita <[e-mail]>
 Build-Depends: libgc-dev, libncurses5-dev, libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], zlib1g-dev, libssl-dev, debhelper (>= 7), gawk | awk, libimlib2-dev
 Homepage: http://sourceforge.net/projects/w3m
 Standards-Version: 3.9.0

=== added file 'debian/patches/091_button.patch'
--- debian/patches/091_button.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/091_button.patch	2011-01-18 10:55:22 +0000
@@ -0,0 +1,354 @@
+From: Tuomas Heino <[e-mail]>
+Bug-Ubuntu: https://launchpad.net/bugs/683337
+Description: Support the button element as defined in HTML 4.01
+Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201009.month/4411.html
+Bug-Debian: http://bugs.debian.org/136810
+
+diff -ur w3m.orig/file.c w3m/file.c
+--- w3m.orig/file.c	2010-12-01 00:35:27.775973000 +0200
++++ w3m/file.c	2010-12-01 00:13:20.352955706 +0200
+@@ -2449,6 +2449,7 @@
+     bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor,
+ 	  sizeof(obuf->anchor));
+     obuf->bp.img_alt = obuf->img_alt;
++    obuf->bp.input_alt = obuf->input_alt;
+     obuf->bp.in_bold = obuf->in_bold;
+     obuf->bp.in_italic = obuf->in_italic;
+     obuf->bp.in_under = obuf->in_under;
+@@ -2466,6 +2467,7 @@
+     bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor,
+ 	  sizeof(obuf->anchor));
+     obuf->img_alt = obuf->bp.img_alt;
++    obuf->input_alt = obuf->bp.input_alt;
+     obuf->in_bold = obuf->bp.in_bold;
+     obuf->in_italic = obuf->bp.in_italic;
+     obuf->in_under = obuf->bp.in_under;
+@@ -2709,7 +2711,7 @@
+     Str line = obuf->line, pass = NULL;
+     char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL,
+ 	*hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL,
+-	*hidden_ins = NULL, *hidden = NULL;
++	*hidden_ins = NULL, *hidden_input, *hidden = NULL;
+ 
+ #ifdef DEBUG
+     if (w3m_debug) {
+@@ -2741,6 +2743,12 @@
+ 		hidden = hidden_img;
+ 	}
+     }
++    if (obuf->input_alt.in) {
++	if ((hidden_input = has_hidden_link(obuf, HTML_INPUT_ALT)) != NULL) {
++	    if (!hidden || hidden_input < hidden)
++		hidden = hidden_input;
++	}
++    }
+     if (obuf->in_bold) {
+ 	if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) {
+ 	    if (!hidden || hidden_bold < hidden)
+@@ -2792,6 +2800,8 @@
+ 	Strcat_charp(line, "</a>");
+     if (obuf->img_alt && !hidden_img)
+ 	Strcat_charp(line, "</img_alt>");
++    if (obuf->input_alt.in && !hidden_input)
++	Strcat_charp(line, "</input_alt>");
+     if (obuf->in_bold && !hidden_bold)
+ 	Strcat_charp(line, "</b>");
+     if (obuf->in_italic && !hidden_italic)
+@@ -3002,6 +3012,18 @@
+ 	Strcat_charp(tmp, "\">");
+ 	push_tag(obuf, tmp->ptr, HTML_IMG_ALT);
+     }
++    if (!hidden_input && obuf->input_alt.in) {
++	Str tmp;
++	if (obuf->input_alt.hseq > 0)
++	    obuf->input_alt.hseq = - obuf->input_alt.hseq;
++	tmp = Sprintf("<INPUT_ALT hseq=\"%d\" fid=\"%d\" name=\"%s\" type=\"%s\" value=\"%s\">",
++		     obuf->input_alt.hseq,
++		     obuf->input_alt.fid,
++		     obuf->input_alt.name->ptr,
++		     obuf->input_alt.type->ptr,
++		     obuf->input_alt.value->ptr);
++	push_tag(obuf, tmp->ptr, HTML_INPUT_ALT);
++    }
+     if (!hidden_bold && obuf->in_bold)
+ 	push_tag(obuf, "<B>", HTML_B);
+     if (!hidden_italic && obuf->in_italic)
+@@ -3704,6 +3726,63 @@
+ }
+ 
+ Str
++process_button(struct parsed_tag *tag)
++{
++    Str tmp = NULL;
++    char *p, *q, *r, *qq = NULL;
++    int qlen, v;
++
++    if (cur_form_id < 0) {
++       char *s = "<form_int method=internal action=none>";
++       tmp = process_form(parse_tag(&s, TRUE));
++    }
++    if (tmp == NULL)
++       tmp = Strnew();
++
++    p = "submit";
++    parsedtag_get_value(tag, ATTR_TYPE, &p);
++    q = NULL;
++    parsedtag_get_value(tag, ATTR_VALUE, &q);
++    r = "";
++    parsedtag_get_value(tag, ATTR_NAME, &r);
++
++    v = formtype(p);
++    if (v == FORM_UNKNOWN)
++       return NULL;
++
++    if (!q) {
++       switch (v) {
++       case FORM_INPUT_SUBMIT:
++       case FORM_INPUT_BUTTON:
++           q = "SUBMIT";
++           break;
++       case FORM_INPUT_RESET:
++           q = "RESET";
++           break;
++       }
++    }
++    if (q) {
++       qq = html_quote(q);
++       qlen = strlen(q);
++    }
++
++    //    Strcat_charp(tmp, "<pre_int>");
++    Strcat(tmp, Sprintf("<input_alt hseq=\"%d\" fid=\"%d\" type=%s "
++                       "name=\"%s\" value=\"%s\">",
++                       cur_hseq++, cur_form_id, p, html_quote(r), qq));
++    return tmp;
++}
++
++Str
++process_n_button(void)
++{
++    Str tmp = Strnew();
++    Strcat_charp(tmp, "</input_alt>");
++    //    Strcat_charp(tmp, "</pre_int>");
++    return tmp;
++}
++
++Str
+ process_select(struct parsed_tag *tag)
+ {
+     Str tmp = NULL;
+@@ -4815,7 +4894,35 @@
+ 	    if (i > obuf->bottom_margin)
+ 		obuf->bottom_margin = i;
+ 	}
++	if (parsedtag_get_value(tag, ATTR_HSEQ, &hseq)) {
++	    obuf->input_alt.hseq = hseq;
++	}
++	if (parsedtag_get_value(tag, ATTR_FID, &i)) {
++	    obuf->input_alt.fid = i;
++	}
++	if (parsedtag_get_value(tag, ATTR_TYPE, &p)) {
++	    obuf->input_alt.type = Strnew_charp(p);
++	}
++	if (parsedtag_get_value(tag, ATTR_VALUE, &p)) {
++	    obuf->input_alt.value = Strnew_charp(p);
++	}
++	if (parsedtag_get_value(tag, ATTR_NAME, &p)) {
++	    obuf->input_alt.name = Strnew_charp(p);
++	}
++	obuf->input_alt.in = 1;
+ 	return 0;
++    case HTML_N_INPUT_ALT:
++	if (obuf->input_alt.in) {
++	    if (!close_effect0(obuf, HTML_INPUT_ALT))
++		push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
++	    obuf->input_alt.hseq = 0;
++	    obuf->input_alt.fid = -1;
++	    obuf->input_alt.in = 0;
++	    obuf->input_alt.type = NULL;
++	    obuf->input_alt.name = NULL;
++	    obuf->input_alt.value = NULL;
++	}
++	return 1;
+     case HTML_TABLE:
+ 	close_anchor(h_env, obuf);
+ 	obuf->table_level++;
+@@ -4924,6 +5031,16 @@
+     case HTML_INPUT:
+ 	close_anchor(h_env, obuf);
+ 	tmp = process_input(tag);
++       if (tmp)
++           HTMLlineproc1(tmp->ptr, h_env);
++       return 1;
++    case HTML_BUTTON:
++       tmp = process_button(tag);
++       if (tmp)
++           HTMLlineproc1(tmp->ptr, h_env);
++       return 1;
++    case HTML_N_BUTTON:
++       tmp = process_n_button();
+ 	if (tmp)
+ 	    HTMLlineproc1(tmp->ptr, h_env);
+ 	return 1;
+@@ -5635,6 +5752,21 @@
+ 				putHmarker(buf->hmarklist, currentLn(buf),
+ 					   hpos, hseq - 1);
+ 			}
++			else if (hseq < 0) {
++			    int h = -hseq - 1;
++			    int hpos = pos;
++			    if (*str == '[')
++				hpos++;
++			    if (buf->hmarklist &&
++				h < buf->hmarklist->nmark &&
++				buf->hmarklist->marks[h].invalid) {
++				buf->hmarklist->marks[h].pos = hpos;
++				buf->hmarklist->marks[h].line = currentLn(buf);
++				buf->hmarklist->marks[h].invalid = 0;
++				hseq = -hseq;
++			    }
++			}
++
+ 			if (!form->target)
+ 			    form->target = buf->baseTarget;
+ 			if (a_textarea &&
+@@ -6702,6 +6834,12 @@
+     obuf->nobr_level = 0;
+     bzero((void *)&obuf->anchor, sizeof(obuf->anchor));
+     obuf->img_alt = 0;
++    obuf->input_alt.hseq = 0;
++    obuf->input_alt.fid = -1;
++    obuf->input_alt.in = 0;
++    obuf->input_alt.type = NULL;
++    obuf->input_alt.name = NULL;
++    obuf->input_alt.value = NULL;
+     obuf->in_bold = 0;
+     obuf->in_italic = 0;
+     obuf->in_under = 0;
+@@ -6737,6 +6875,15 @@
+ 	push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT);
+ 	obuf->img_alt = NULL;
+     }
++    if (obuf->input_alt.in) {
++	push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
++	obuf->input_alt.hseq = 0;
++	obuf->input_alt.fid = -1;
++	obuf->input_alt.in = 0;
++	obuf->input_alt.type = NULL;
++	obuf->input_alt.name = NULL;
++	obuf->input_alt.value = NULL;
++    }
+     if (obuf->in_bold) {
+ 	push_tag(obuf, "</b>", HTML_N_B);
+ 	obuf->in_bold = 0;
+diff -ur w3m.orig/fm.h w3m/fm.h
+--- w3m.orig/fm.h	2010-12-01 00:35:38.552891989 +0200
++++ w3m/fm.h	2010-12-01 00:13:20.352955706 +0200
+@@ -558,6 +558,13 @@
+ #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0)
+ #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1)
+ 
++struct input_alt_attr {
++  int hseq;
++  int fid;
++  int in;
++  Str type, name, value;
++};
++
+ typedef struct {
+     int pos;
+     int len;
+@@ -565,6 +572,7 @@
+     long flag;
+     Anchor anchor;
+     Str img_alt;
++    struct input_alt_attr input_alt;
+     char fontstat[FONTSTAT_SIZE];
+     short nobr_level;
+     Lineprop prev_ctype;
+@@ -587,6 +595,7 @@
+     short nobr_level;
+     Anchor anchor;
+     Str img_alt;
++    struct input_alt_attr input_alt;
+     char fontstat[FONTSTAT_SIZE];
+     char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
+     int fontstat_sp;
+diff -ur w3m.orig/html.c w3m/html.c
+--- w3m.orig/html.c	2010-12-01 00:35:27.775973000 +0200
++++ w3m/html.c	2010-12-01 00:25:24.402955871 +0200
+@@ -56,6 +56,9 @@
+     ATTR_CORE
+ };
+ #define MAXA_INPUT      MAXA_CORE + 12
++unsigned char ALST_BUTTON[] =
++    { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CORE };
++#define MAXA_BUTTON	MAXA_CORE + 3
+ unsigned char ALST_TEXTAREA[] =
+     { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE };
+ #define MAXA_TEXTAREA   MAXA_CORE + 4
+@@ -235,8 +238,8 @@
+     {"/i", NULL, 0, TFLG_END},	/*  110 HTML_N_I */
+     {"strong", NULL, 0, 0},		/* 111 HTML_STRONG */
+     {"/strong", NULL, 0, TFLG_END},	/* 112 HTML_N_STRONG */
+-    {NULL, NULL, 0, 0},		/* 113 Undefined       */
+-    {NULL, NULL, 0, 0},		/* 114 Undefined       */
++    {"button", ALST_BUTTON, MAXA_BUTTON, 0},	/* 113 HTML_BUTTON */
++    {"/button", NULL, 0, TFLG_END},	/* 114 HTML_N_BUTTON */
+     {NULL, NULL, 0, 0},		/* 115 Undefined       */
+     {NULL, NULL, 0, 0},		/* 116 Undefined       */
+     {NULL, NULL, 0, 0},		/* 117 Undefined       */
+diff -ur w3m.orig/html.h w3m/html.h
+--- w3m.orig/html.h	2010-12-01 00:35:27.775973000 +0200
++++ w3m/html.h	2010-12-01 00:27:42.482954382 +0200
+@@ -202,6 +202,8 @@
+ #define HTML_N_I	110
+ #define HTML_STRONG	111
+ #define HTML_N_STRONG	112
++#define HTML_BUTTON	113
++#define HTML_N_BUTTON	114
+ 
+    /* pseudo tag */
+ #define HTML_SELECT_INT     120
+diff -ur w3m.orig/proto.h w3m/proto.h
+--- w3m.orig/proto.h	2010-12-01 00:35:27.775973000 +0200
++++ w3m/proto.h	2010-12-01 00:13:20.364142122 +0200
+@@ -203,6 +203,8 @@
+ extern Str process_img(struct parsed_tag *tag, int width);
+ extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
+ extern Str process_input(struct parsed_tag *tag);
++extern Str process_button(struct parsed_tag *tag);
++extern Str process_n_button(void);
+ extern Str process_select(struct parsed_tag *tag);
+ extern Str process_n_select(void);
+ extern void feed_select(char *str);
+diff -ur w3m.orig/table.c w3m/table.c
+--- w3m.orig/table.c	2010-12-01 00:35:27.775973000 +0200
++++ w3m/table.c	2010-12-01 00:13:20.364142122 +0200
+@@ -2873,6 +2873,14 @@
+ 	tmp = process_input(tag);
+ 	feed_table1(tbl, tmp, mode, width);
+ 	break;
++    case HTML_BUTTON:
++       tmp = process_button(tag);
++       feed_table1(tbl, tmp, mode, width);
++       break;
++    case HTML_N_BUTTON:
++       tmp = process_n_button();
++       feed_table1(tbl, tmp, mode, width);
++       break;
+     case HTML_SELECT:
+ 	tmp = process_select(tag);
+ 	if (tmp)
+diff -ur w3m.orig/tagtable.tab w3m/tagtable.tab
+--- w3m.orig/tagtable.tab	2010-12-01 00:35:27.775973000 +0200
++++ w3m/tagtable.tab	2010-12-01 00:30:05.022953889 +0200
+@@ -62,6 +62,8 @@
+ /samp		HTML_NOP
+ strong		HTML_STRONG
+ /strong		HTML_N_STRONG
++button		HTML_BUTTON
++/button		HTML_N_BUTTON
+ var		HTML_NOP
+ /var		HTML_NOP
+ address		HTML_BR

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-07-07 00:10:09 +0000
+++ debian/patches/series	2011-01-18 10:55:22 +0000
@@ -7,3 +7,4 @@
 070_form-update.patch
 080_xhtml-support.patch
 090_simple-preserve-space.patch
+091_button.patch