CVS commit: pkgsrc/textproc/ja-groff

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Mar 26 21:09:20 UTC 2020

Modified Files:
        pkgsrc/textproc/ja-groff: distinfo
        pkgsrc/textproc/ja-groff/patches: patch-ao

Log Message:
textproc/ja-groff: fix -Wchar-subscripts


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ja-groff/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ja-groff/patches/patch-ao

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

Modified files:

Index: pkgsrc/textproc/ja-groff/distinfo
diff -u pkgsrc/textproc/ja-groff/distinfo:1.6 pkgsrc/textproc/ja-groff/distinfo:1.7
--- pkgsrc/textproc/ja-groff/distinfo:1.6       Wed Nov  4 01:59:37 2015
+++ pkgsrc/textproc/ja-groff/distinfo   Thu Mar 26 21:09:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:59:37 agc Exp $
+$NetBSD: distinfo,v 1.7 2020/03/26 21:09:20 rillig Exp $
 
 SHA1 (groff-1.10.tar.gz) = 032eeb221aff1a621019374646819e8741c11d39
 RMD160 (groff-1.10.tar.gz) = 3dafd992282ef8bf1b71d908acc45ede575b177f
@@ -22,7 +22,7 @@ SHA1 (patch-ak) = 2cd8539d364edee3f305bb
 SHA1 (patch-al) = 63c383ec386657aff1d84e01dee1843d7f94109b
 SHA1 (patch-am) = 4d0a6a4e76691d2baa17e7a0784659668977a9a6
 SHA1 (patch-an) = 3af3af89d799d968d64cfa8ba89f6b549db17bdb
-SHA1 (patch-ao) = 0e209fb57d849ac670ad2a635b7b78114203e705
+SHA1 (patch-ao) = c4a097f9e3d8af3ac9cbd18438c54674a0ed3564
 SHA1 (patch-ap) = 54949929ca91fcfb090c2d570d754d347a1923fd
 SHA1 (patch-aq) = 6ba046f7ce8d7c9de57420558801b32768dd9792
 SHA1 (patch-ar) = cddbf3b845ae009e0786d23b777724b8e1ff9a87

Index: pkgsrc/textproc/ja-groff/patches/patch-ao
diff -u pkgsrc/textproc/ja-groff/patches/patch-ao:1.1 pkgsrc/textproc/ja-groff/patches/patch-ao:1.2
--- pkgsrc/textproc/ja-groff/patches/patch-ao:1.1       Tue Mar 21 17:30:00 2006
+++ pkgsrc/textproc/ja-groff/patches/patch-ao   Thu Mar 26 21:09:20 2020
@@ -1,7 +1,37 @@
-$NetBSD: patch-ao,v 1.1 2006/03/21 17:30:00 yyamano Exp $
+$NetBSD: patch-ao,v 1.2 2020/03/26 21:09:20 rillig Exp $
+
+tfmtodit.cc: In member function 'int tfm::get_height(int)':
+tfmtodit.cc:212:47: error: array subscript has type 'char' [-Werror=char-subscripts]
+   return height[char_info[i - bc].height_index];
+                                               ^
+tfmtodit.cc: In member function 'int tfm::get_depth(int)':
+tfmtodit.cc:217:45: error: array subscript has type 'char' [-Werror=char-subscripts]
+   return depth[char_info[i - bc].depth_index];
+                                             ^
+tfmtodit.cc: In member function 'int tfm::get_italic(int)':
+tfmtodit.cc:222:47: error: array subscript has type 'char' [-Werror=char-subscripts]
+   return italic[char_info[i - bc].italic_index];
+                                               ^
+
+The above errors are harmless, but it's too hard to prove for the
+compiler. These variables were always initialized from an unsigned char,
+shifted right by a few positions.
 
 --- tfmtodit/tfmtodit.cc.orig  2006-03-22 01:56:43.000000000 +0900
 +++ tfmtodit/tfmtodit.cc
+@@ -67,9 +67,9 @@ both be zero. */
+ 
+ struct char_info_word {
+   unsigned char width_index;
+-  char height_index;
+-  char depth_index;
+-  char italic_index;
++  unsigned char height_index;
++  unsigned char depth_index;
++  unsigned char italic_index;
+   char tag;
+   unsigned char remainder;
+ };
 @@ -651,7 +651,7 @@ lig_chars table. `ch' gives the full-nam
  gives the groff name of the character, `i' gives its index in
  the encoding, which is filled in later  (-1 if it does not appear). */