diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03-w3m.1-debian-fix | 34 | ||||
| -rw-r--r-- | debian/patches/04-w3m-0.3.2.1-frame-fix-backport | 53 | ||||
| -rw-r--r-- | debian/patches/05-w3m-0.3.2.2-img-alt-fix-backport | 27 |
3 files changed, 10 insertions, 104 deletions
diff --git a/debian/patches/03-w3m.1-debian-fix b/debian/patches/03-w3m.1-debian-fix index f364b6b..faf54c5 100644 --- a/debian/patches/03-w3m.1-debian-fix +++ b/debian/patches/03-w3m.1-debian-fix @@ -1,24 +1,9 @@ PATCH: -p1 ---- w3m/doc/w3m.1 Wed Nov 21 14:56:35 2001 -+++ w3m-2/doc/w3m.1 Sat Dec 1 03:43:55 2001 -@@ -53,15 +53,6 @@ - .B -l line - # of preserved line (default 10000) - .TP --.B -s --Shift_JIS --.TP --.B -j --JIS --.TP --.B -e --EUC-JP --.TP - .B -B - load bookmark - .TP -@@ -126,7 +117,7 @@ +diff -Nru w3m-0.4rc1.orig/doc/w3m.1 w3m-0.4rc1/doc/w3m.1 +--- w3m-0.4rc1.orig/doc/w3m.1 2002-11-12 21:36:30.000000000 +0900 ++++ w3m-0.4rc1/doc/w3m.1 2003-02-11 03:42:48.000000000 +0900 +@@ -123,7 +123,7 @@ .B -pauth user:pass proxy authentication .TP @@ -27,8 +12,9 @@ PATCH: -p1 squeeze multiple blank lines .TP .B -W ---- w3m/doc-jp/w3m.1 Wed Nov 21 14:56:36 2001 -+++ w3m-2/doc-jp/w3m.1 Sat Dec 1 03:44:14 2001 +diff -Nru w3m-0.4rc1.orig/doc-jp/w3m.1 w3m-0.4rc1/doc-jp/w3m.1 +--- w3m-0.4rc1.orig/doc-jp/w3m.1 2002-11-12 21:36:30.000000000 +0900 ++++ w3m-0.4rc1/doc-jp/w3m.1 2003-02-11 03:44:15.000000000 +0900 @@ -39,15 +39,6 @@ 標準入力の内容を表示するときに保存される最大行数を指定する． デフォルトは10000． @@ -42,10 +28,10 @@ PATCH: -p1 -.B \-j -JIS (ISO-2022-JP)コードで表示する． -.TP - .BI \-I\ e|s - 入力文書の文字コードを指定する． + .BI \-O\ e|s|j|N|m + 表示に使う文字コードを指定する. .TP -@@ -87,7 +78,7 @@ +@@ -90,7 +81,7 @@ .B \-F フレームを自動表示する． .TP diff --git a/debian/patches/04-w3m-0.3.2.1-frame-fix-backport b/debian/patches/04-w3m-0.3.2.1-frame-fix-backport deleted file mode 100644 index a6180cb..0000000 --- a/debian/patches/04-w3m-0.3.2.1-frame-fix-backport +++ /dev/null @@ -1,53 +0,0 @@ -PATCH: -p1 - - ---- w3m-0.3.orig/frame.c Sat Feb 9 15:27:14 2002 -+++ w3m-0.3/frame.c Wed Nov 27 06:46:03 2002 -@@ -535,14 +535,15 @@ - frame.body->attr = F_UNLOADED; - if (frame.body->flags & FB_NO_BUFFER) - fprintf(f1, "Open %s with other method", -- frame.body->url); -+ html_quote(frame.body->url)); - else if (frame.body->url) -- fprintf(f1, "Can't open %s", frame.body->url); -+ fprintf(f1, "Can't open %s", -+ html_quote(frame.body->url)); - else - fprintf(f1, - "This frame (%s) contains no src attribute", -- frame.body->name ? frame.body-> -- name : "(no name)"); -+ frame.body->name ? -+ html_quote(frame.body->name) : "(no name)"); - break; - } - parseURL2(frame.body->url, &base, currentURL); -@@ -636,7 +637,7 @@ - /* prohibit_tags */ - Strshrinkfirst(tok, 1); - Strshrink(tok, 1); -- fprintf(f1, "<!-- %s -->", tok->ptr); -+ fprintf(f1, "<!-- %s -->", html_quote(tok->ptr)); - goto token_end; - case HTML_TABLE: - t_stack++; -@@ -649,7 +650,7 @@ - Strshrink(tok, 1); - fprintf(f1, - "<!-- table stack underflow: %s -->", -- tok->ptr); -+ html_quote(tok->ptr)); - goto token_end; - } - break; -@@ -669,7 +670,8 @@ - if (!t_stack) { - Strshrinkfirst(tok, 1); - Strshrink(tok, 1); -- fprintf(f1, "<!-- %s -->", tok->ptr); -+ fprintf(f1, "<!-- %s -->", -+ html_quote(tok->ptr)); - goto token_end; - - } diff --git a/debian/patches/05-w3m-0.3.2.2-img-alt-fix-backport b/debian/patches/05-w3m-0.3.2.2-img-alt-fix-backport deleted file mode 100644 index 6b30c1c..0000000 --- a/debian/patches/05-w3m-0.3.2.2-img-alt-fix-backport +++ /dev/null @@ -1,27 +0,0 @@ -PATCH: -p1 - ---- w3m-0.3/file.c Tue Mar 5 16:58:09 2002 -+++ w3m-0.3-ja/file.c Thu Dec 5 17:30:30 2002 -@@ -2975,11 +2975,11 @@ - Strcat_charp(tmp, html_quote(Strnew_charp_n(q, nw)->ptr)); - } - else -- Strcat_charp(tmp, q); -+ Strcat_charp(tmp, html_quote(q)); - } - else - #endif -- Strcat_charp(tmp, q); -+ Strcat_charp(tmp, html_quote(q)); - goto img_end; - } - if (w > 0 && i > 0) { -@@ -6105,7 +6105,7 @@ - HTMLlineproc0(lineBuf2->ptr, &htmlenv1, internal); - } - if (obuf.status != R_ST_NORMAL) -- HTMLlineproc1(correct_irrtag(obuf.status)->ptr, &htmlenv1); -+ HTMLlineproc0(correct_irrtag(obuf.status)->ptr, &htmlenv1, internal); - obuf.status = R_ST_NORMAL; - completeHTMLstream(&htmlenv1, &obuf); - flushline(&htmlenv1, &obuf, 0, 2, htmlenv1.limit); |