CVS commit: pkgsrc/www/htmlcxx

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 16 18:55:44 UTC 2024

Modified Files:
        pkgsrc/www/htmlcxx: distinfo
        pkgsrc/www/htmlcxx/patches: patch-html_CharsetConverter.cc
Added Files:
        pkgsrc/www/htmlcxx/patches: patch-html_CharsetConverter.h

Log Message:
htmlcxx: fix build with gcc 12


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/htmlcxx/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.h

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

Modified files:

Index: pkgsrc/www/htmlcxx/distinfo
diff -u pkgsrc/www/htmlcxx/distinfo:1.5 pkgsrc/www/htmlcxx/distinfo:1.6
--- pkgsrc/www/htmlcxx/distinfo:1.5     Tue Oct 26 11:29:33 2021
+++ pkgsrc/www/htmlcxx/distinfo Sun Jun 16 18:55:44 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:29:33 nia Exp $
+$NetBSD: distinfo,v 1.6 2024/06/16 18:55:44 wiz Exp $
 
 BLAKE2s (htmlcxx-0.85.tar.gz) = 2da0bbbf805df2a24e0001c647c59eb08b2c9511e01ee799504d3cb31e4a5dcf
 SHA512 (htmlcxx-0.85.tar.gz) = a385b65fb668727b0034a95e5dcda18939e4cd2fa5140bbf3bc63907abc481cb4e6f2f46089eac131cde2b8234a4fc5db4f81253b10e6dff6b42632cea990a61
 Size (htmlcxx-0.85.tar.gz) = 414624 bytes
-SHA1 (patch-html_CharsetConverter.cc) = c06dd6a2ad59ebbf25c65a567b24ace73b58f52f
+SHA1 (patch-html_CharsetConverter.cc) = 9546fcb1ceca786d1f831cb6d0a2a70a97d09187
+SHA1 (patch-html_CharsetConverter.h) = c19c55f6dfede117c73da261fd1ce26025c0fa26
 SHA1 (patch-html_ci__string.h) = 71438e4eea290f5934918d1996d0c80eefd5ffe5

Index: pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc
diff -u pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.2 pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.3
--- pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc:1.2       Fri Oct 25 10:29:04 2019
+++ pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.cc   Sun Jun 16 18:55:44 2024
@@ -1,10 +1,13 @@
-$NetBSD: patch-html_CharsetConverter.cc,v 1.2 2019/10/25 10:29:04 kamil Exp $
+$NetBSD: patch-html_CharsetConverter.cc,v 1.3 2024/06/16 18:55:44 wiz Exp $
 
 Fix build on NetBSD.
 
+Fix build with c++11, from
+https://sourceforge.net/p/htmlcxx/patches/8/
+
 --- html/CharsetConverter.cc.orig      2011-05-15 17:32:10.000000000 +0000
 +++ html/CharsetConverter.cc
-@@ -4,6 +4,15 @@
+@@ -4,10 +4,19 @@
  #include <cerrno>
  #include "CharsetConverter.h"
  
@@ -20,6 +23,11 @@ Fix build on NetBSD.
  using namespace std;
  using namespace htmlcxx;
  
+-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
++CharsetConverter::CharsetConverter(const string &from, const string &to)
+ {
+       mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
+       if (mIconvDescriptor == (iconv_t)(-1))
 @@ -37,7 +46,11 @@ string CharsetConverter::convert(const s
  
        size_t ret;

Added files:

Index: pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.h
diff -u /dev/null pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.h:1.1
--- /dev/null   Sun Jun 16 18:55:44 2024
+++ pkgsrc/www/htmlcxx/patches/patch-html_CharsetConverter.h    Sun Jun 16 18:55:44 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-html_CharsetConverter.h,v 1.1 2024/06/16 18:55:44 wiz Exp $
+
+Fix build with c++11 using
+https://sourceforge.net/p/htmlcxx/patches/8/
+
+--- html/CharsetConverter.h.orig       2011-02-13 22:24:53.000000000 +0000
++++ html/CharsetConverter.h
+@@ -17,7 +17,7 @@ namespace htmlcxx
+                                               : std::runtime_error(arg) {}
+                       };
+                       
+-                      CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
++                      CharsetConverter(const std::string &from, const std::string &to);
+                       ~CharsetConverter();
+                       
+                       std::string convert(const std::string &input);