CVS commit: pkgsrc/www

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Dec 17 13:35:10 UTC 2024

Modified Files:
        pkgsrc/www/w3m: Makefile distinfo
        pkgsrc/www/w3m-img: Makefile
Added Files:
        pkgsrc/www/w3m/patches: patch-file.c

Log Message:
www/w3m, www/w3m-img: Fix incorrect nests in DL when DT/DD tags are not closed

* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/www/w3m/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/w3m/distinfo
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/w3m-img/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/w3m/patches/patch-file.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/w3m/Makefile
diff -u pkgsrc/www/w3m/Makefile:1.99 pkgsrc/www/w3m/Makefile:1.100
--- pkgsrc/www/w3m/Makefile:1.99        Mon Apr  8 06:01:21 2024
+++ pkgsrc/www/w3m/Makefile     Tue Dec 17 13:35:09 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2024/04/08 06:01:21 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2024/12/17 13:35:09 ryoon Exp $
 
 PKGNAME=       w3m-${W3M_PKGVERS}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=    w3m-img-[0-9]*

Index: pkgsrc/www/w3m/distinfo
diff -u pkgsrc/www/w3m/distinfo:1.39 pkgsrc/www/w3m/distinfo:1.40
--- pkgsrc/www/w3m/distinfo:1.39        Mon Apr  8 06:01:21 2024
+++ pkgsrc/www/w3m/distinfo     Tue Dec 17 13:35:09 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.39 2024/04/08 06:01:21 wiz Exp $
+$NetBSD: distinfo,v 1.40 2024/12/17 13:35:09 ryoon Exp $
 
 BLAKE2s (w3m-0.5.3+git20230121.tar.gz) = 8dd724d95a676c9831ea20599767c6fec0a27e02b6487af970f749768b41967f
 SHA512 (w3m-0.5.3+git20230121.tar.gz) = f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
 Size (w3m-0.5.3+git20230121.tar.gz) = 2322709 bytes
 SHA1 (patch-etc.c) = af69b43ceba1e2ffd8c602dacd9272a3fb2ec5b0
+SHA1 (patch-file.c) = a93d207e25dc055d7f3fd931581790bf90e6edfa

Index: pkgsrc/www/w3m-img/Makefile
diff -u pkgsrc/www/w3m-img/Makefile:1.34 pkgsrc/www/w3m-img/Makefile:1.35
--- pkgsrc/www/w3m-img/Makefile:1.34    Mon Apr  8 06:01:21 2024
+++ pkgsrc/www/w3m-img/Makefile Tue Dec 17 13:35:10 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2024/04/08 06:01:21 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/12/17 13:35:10 ryoon Exp $
 
 PKGNAME=       w3m-img-${W3M_PKGVERS}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Multilingualized version of w3m with inline image support
 
 CONFLICTS+=    w3m-[0-9]*

Added files:

Index: pkgsrc/www/w3m/patches/patch-file.c
diff -u /dev/null pkgsrc/www/w3m/patches/patch-file.c:1.1
--- /dev/null   Tue Dec 17 13:35:10 2024
+++ pkgsrc/www/w3m/patches/patch-file.c Tue Dec 17 13:35:10 2024
@@ -0,0 +1,68 @@
+$NetBSD: patch-file.c,v 1.1 2024/12/17 13:35:10 ryoon Exp $
+
+* Revert DL/DT/DD related change. It is broken and cannot display
+  doc-jp/FAQ.html and http://www.cpm.z80.de/ correctly, for example.
+  The old behavior may not be perfect however it works.
+
+--- file.c.orig        2023-01-21 02:01:52.000000000 +0000
++++ file.c
+@@ -4410,14 +4410,6 @@ process_idattr(struct readbuffer *obuf, 
+         envs[h_env->envc].indent = envs[h_env->envc - 1].indent; \
+     }
+ 
+-#define PUSH_ENV_NOINDENT(cmd) \
+-    if (++h_env->envc_real < h_env->nenv) { \
+-      ++h_env->envc; \
+-      envs[h_env->envc].env = cmd; \
+-      envs[h_env->envc].count = 0; \
+-      envs[h_env->envc].indent = envs[h_env->envc - 1].indent; \
+-    }
+-
+ #define POP_ENV \
+     if (h_env->envc_real-- < h_env->nenv) \
+       h_env->envc--;
+@@ -4660,7 +4652,6 @@ HTMLtagproc1(struct parsed_tag *tag, str
+     case HTML_N_OL:
+     case HTML_N_DL:
+     case HTML_N_BLQ:
+-    case HTML_N_DD:
+       CLOSE_DT;
+       CLOSE_A;
+       if (h_env->envc > 0) {
+@@ -4687,7 +4678,7 @@ HTMLtagproc1(struct parsed_tag *tag, str
+               do_blankline(h_env, obuf, envs[h_env->envc].indent, 0,
+                            h_env->limit);
+       }
+-      PUSH_ENV_NOINDENT(cmd);
++      PUSH_ENV(cmd);
+       if (parsedtag_exists(tag, ATTR_COMPACT))
+           envs[h_env->envc].env = HTML_DL_COMPACT;
+       obuf->flag |= RB_IGNORE_P;
+@@ -4783,7 +4774,7 @@ HTMLtagproc1(struct parsed_tag *tag, str
+           (h_env->envc_real < h_env->nenv &&
+            envs[h_env->envc].env != HTML_DL &&
+            envs[h_env->envc].env != HTML_DL_COMPACT)) {
+-          PUSH_ENV_NOINDENT(HTML_DL);
++          PUSH_ENV(HTML_DL);
+       }
+       if (h_env->envc > 0) {
+           flushline(h_env, obuf,
+@@ -4808,12 +4799,14 @@ HTMLtagproc1(struct parsed_tag *tag, str
+     case HTML_DD:
+       CLOSE_A;
+       CLOSE_DT;
+-      if (envs[h_env->envc].env == HTML_DL ||
+-              envs[h_env->envc].env == HTML_DL_COMPACT) {
+-          PUSH_ENV(HTML_DD);
++      if (h_env->envc == 0 ||
++          (h_env->envc_real < h_env->nenv &&
++           envs[h_env->envc].env != HTML_DL &&
++           envs[h_env->envc].env != HTML_DL_COMPACT)) {
++          PUSH_ENV(HTML_DL);
+       }
+ 
+-      if (h_env->envc > 0 && envs[h_env->envc - 1].env == HTML_DL_COMPACT) {
++      if (envs[h_env->envc].env == HTML_DL_COMPACT) {
+           if (obuf->pos > envs[h_env->envc].indent)
+               flushline(h_env, obuf, envs[h_env->envc].indent, 0,
+                         h_env->limit);