CVS commit: pkgsrc/textproc/openjade

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Mar 26 21:47:55 UTC 2020

Modified Files:
        pkgsrc/textproc/openjade: distinfo
Added Files:
        pkgsrc/textproc/openjade/patches: patch-jade_HtmlFOTBuilder.cxx

Log Message:
textproc/openjade: fix -Wchar-subscripts


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/openjade/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/openjade/patches/patch-jade_HtmlFOTBuilder.cxx

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

Modified files:

Index: pkgsrc/textproc/openjade/distinfo
diff -u pkgsrc/textproc/openjade/distinfo:1.16 pkgsrc/textproc/openjade/distinfo:1.17
--- pkgsrc/textproc/openjade/distinfo:1.16      Sat Jul 15 14:34:15 2017
+++ pkgsrc/textproc/openjade/distinfo   Thu Mar 26 21:47:54 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/07/15 14:34:15 wiz Exp $
+$NetBSD: distinfo,v 1.17 2020/03/26 21:47:54 rillig Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
@@ -10,6 +10,7 @@ SHA1 (patch-ac) = 2492ccb9bd736318ecd5c3
 SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
 SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285
 SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5
+SHA1 (patch-jade_HtmlFOTBuilder.cxx) = 98643b1159b6f22ae8e77ac3e8c5f431c167ce83
 SHA1 (patch-jade_TeXFOTBuilder.cxx) = 037953d73d896afae7531e313821224ccd1e30e4
 SHA1 (patch-jade_TransformFOTBuilder.cxx) = cf4c51f05f95e31111a7e48d7984397ba4850e7d
 SHA1 (patch-msggen.pl) = d55befeb6f859c9c3330c2083fce5d5281a496ef

Added files:

Index: pkgsrc/textproc/openjade/patches/patch-jade_HtmlFOTBuilder.cxx
diff -u /dev/null pkgsrc/textproc/openjade/patches/patch-jade_HtmlFOTBuilder.cxx:1.1
--- /dev/null   Thu Mar 26 21:47:55 2020
+++ pkgsrc/textproc/openjade/patches/patch-jade_HtmlFOTBuilder.cxx      Thu Mar 26 21:47:54 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-jade_HtmlFOTBuilder.cxx,v 1.1 2020/03/26 21:47:54 rillig Exp $
+
+HtmlFOTBuilder.cxx: In member function 'void OpenJade_DSSSL::HtmlFOTBuilder::CharStyle::output(OpenSP::OutputCharStream&) const':
+HtmlFOTBuilder.cxx:493:59: error: array subscript has type 'char' [-Werror=char-subscripts]
+     os << indent << "font-style: " << styleNames[fontStyle] << ';' << RE;
+                                                           ^
+HtmlFOTBuilder.cxx: In member function 'void OpenJade_DSSSL::HtmlFOTBuilder::ParaStyle::output(OpenSP::OutputCharStream&) const':
+HtmlFOTBuilder.cxx:537:55: error: array subscript has type 'char' [-Werror=char-subscripts]
+     os << indent << "text-align: " << alignNames[align] << ';' << RE;
+                                                       ^
+
+These char variables correspond to the enums that are declared just above of them.
+
+--- jade/HtmlFOTBuilder.cxx.orig       1999-05-02 15:47:07.000000000 +0000
++++ jade/HtmlFOTBuilder.cxx
+@@ -55,7 +55,7 @@ public:
+     bool operator!=(const CharProps &cp) const { return !(*this == cp); }
+     char fontWeight;
+     enum { styleNormal, styleItalic, styleOblique };
+-    char fontStyle;
++    unsigned char fontStyle;
+     unsigned color;
+     Length fontSize;
+     StringC fontFamily;
+@@ -72,7 +72,7 @@ public:
+     Length rightMargin;
+     Length lineHeight;
+     Length textIndent;
+-    char align;
++    unsigned char align;
+   };
+   struct ParaProps : public InheritParaProps {
+     ParaProps(const InheritParaProps &props)