[gentoo-commits] repo/gentoo:master commit in: dev-cpp/htmlcxx/files/, dev-cpp/htmlcxx/
commit: f7b7c15da117ceb50850679f14573de8a1e22e4e Author: James Le Cuirot gentoo org> AuthorDate: Tue Jun 1 21:54:20 2021 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jun 1 21:55:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b7c15d dev-cpp/htmlcxx: Patch to fix building with GCC 11 / C++-17 Closes: https://bugs.gentoo.org/786684 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch | 26 ++ dev-cpp/htmlcxx/htmlcxx-0.87.ebuild| 6 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch b/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch new file mode 100644 index 000..9f8f060de45 --- /dev/null +++ b/dev-cpp/htmlcxx/files/htmlcxx-0.87-c++17.patch @@ -0,0 +1,26 @@ +https://sourceforge.net/p/htmlcxx/patches/8/ + +diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc +--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.0 + b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100 +@@ -7,7 +7,7 @@ + using namespace std; + using namespace htmlcxx; + +-CharsetConverter::CharsetConverter(const string , const string ) throw (Exception) ++CharsetConverter::CharsetConverter(const string , const string ) + { + mIconvDescriptor = iconv_open(to.c_str(), from.c_str()); + if (mIconvDescriptor == (iconv_t)(-1)) +diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h +--- a/html/CharsetConverter.h 2018-12-29 03:13:56.0 + b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100 +@@ -17,7 +17,7 @@ + : std::runtime_error(arg) {} + }; + +- CharsetConverter(const std::string , const std::string ) throw (Exception); ++ CharsetConverter(const std::string , const std::string ); + ~CharsetConverter(); + + std::string convert(const std::string ); diff --git a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild index fdcb01bc5cf..3ac9069308c 100644 --- a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild +++ b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/${P}-c++17.patch +) + ECONF_SOURCE="${S}" multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/htmlcxx/files/, dev-cpp/htmlcxx/
commit: c2ac95a99799e9fb95769e79811f3bded620fa9c Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 13 22:24:30 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 13 22:24:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ac95a9 dev-cpp/htmlcxx: Drop old 0.86 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/htmlcxx/Manifest | 1 - ...rstream-is-deprecated-use-sstream-instead.patch | 56 -- ..._syntax.y-for-use-with-less-ancient-Bison.patch | 67 -- dev-cpp/htmlcxx/htmlcxx-0.86.ebuild| 35 --- 4 files changed, 159 deletions(-) diff --git a/dev-cpp/htmlcxx/Manifest b/dev-cpp/htmlcxx/Manifest index d686b34f837..6a7558d8de9 100644 --- a/dev-cpp/htmlcxx/Manifest +++ b/dev-cpp/htmlcxx/Manifest @@ -1,2 +1 @@ -DIST htmlcxx-0.86.tar.gz 469416 BLAKE2B 6edd4b7755db6d8911bc4ee6b1b61792b08d6a381971162a77cd3a6c7cb6cdb06e5a4a77b0a815589edab26aec04490a6b6c9edd80199f01304a506c707688b6 SHA512 dcff9c9946e1c3429af2230997c965b89a28a8ee219d8d594800106ff578bb21154e4680c38a09fb5f96cd4051c89cbf16f2151d30be93d4e3d291ff421aafcb DIST htmlcxx-0.87.tar.gz 477083 BLAKE2B 94977e758b4f2643f39a464094e315c11b78bc957a3eb054e6a7608828345704a82c3ca36c5ac2855054e7570daebb80d8a63639f3a7197344d25f2d16830702 SHA512 391b94c7ea2d17a04d46ac80f8146e6c2b14b289379c40f3d432ed9c0f36222ced6384d725cdecfc352e28c30f11976249b6a3f7133bbee3161a7883d197fca7 diff --git a/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch b/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch deleted file mode 100644 index 822c1c8e41a..000 --- a/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 04fbe8cb7d933699f2a8ac06d89b205d933070c1 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Wed, 14 Sep 2016 22:56:14 +0100 -Subject: [PATCH 1/3] strstream is deprecated, use sstream instead - - html/Uri.cc | 2 +- - html/utils.cc | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/html/Uri.cc b/html/Uri.cc -index 4ddb3dd..034d29a 100644 a/html/Uri.cc -+++ b/html/Uri.cc -@@ -1,7 +1,7 @@ - #include "Uri.h" - - #include "wincstring.h" --#include -+#include - #include - #include - #include "tld.h" -diff --git a/html/utils.cc b/html/utils.cc -index 37ee889..e56cbaf 100644 a/html/utils.cc -+++ b/html/utils.cc -@@ -1,7 +1,7 @@ - #include - #include - #include --#include -+#include - #include "Uri.h" - - #include "utils.h" -@@ -509,7 +509,7 @@ namespace htmlcxx { - string __serialize_gml(const tree , tree::iterator it, tree::iterator end, unsigned int parent_id, unsigned int& label) { - - using namespace std; -- ostrstream ret; -+ ostringstream ret; - tree::sibling_iterator sib = tr.begin(it); - while(sib != tr.end(it)) { - ret << "node [ id " << ++label << "\n label \"" << label << "\"\n]\n"; -@@ -519,7 +519,6 @@ namespace htmlcxx { - } - ret << ends; - string str = ret.str(); -- ret.freeze(0); - return str; - } - --- -2.8.2 - diff --git a/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch b/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch deleted file mode 100644 index c387deeca7f..000 --- a/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 807081583ea58b07a5ff2e0659f4173492befb8a Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Wed, 14 Sep 2016 22:56:35 +0100 -Subject: [PATCH 2/3] Update css_syntax.y for use with less ancient Bison - -New pregenerated css_syntax.c to follow. - css/css_syntax.y | 24 +++- - 1 file changed, 15 insertions(+), 9 deletions(-) - -diff --git a/css/css_syntax.y b/css/css_syntax.y -index e75720d..0d9b177 100644 a/css/css_syntax.y -+++ b/css/css_syntax.y -@@ -4,13 +4,13 @@ - #include "css_lex.h" - #include "parser.h" - --#define YYPARSE_PARAM yyparam - #define YYERROR_VERBOSE 1 - //#define YYDEBUG 1 - - %} - --%pure_parser -+%parse-param {void *yyparam} -+%pure-parser - - %union { - char *lexeme; -@@ -22,6 +22,19 @@ - int pseudo_element; - } - -+%{ -+ -+int yylex(YYSTYPE *lvalp); -+ -+int yyerror(void *yyparam, const char *s) { -+#if YYDEBUG -+ fprintf(stderr, "Error: %s\n", s); -+#endif -+ return 0; -+} -+ -+%} -+ - %token IMPORT_SYM - %token IMPORTANT_SYM - %token IDENT -@@ -571,13 +584,6 @@ hexcolor - - %% - --int yyerror(char *s) { --#if YYDEBUG -- fprintf(stderr,
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/htmlcxx/
commit: cdefa7d2502c86215a7fea4c0c5f16b717302ceb Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 13 22:23:52 2019 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 13 22:23:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdefa7d2 dev-cpp/htmlcxx: Version bump to 0.87, EAPI 7 I have dropped the flex and yacc dependencies. I think yacc was required before but now a pregenerated file is included and the rule to remake it is missing. I'm not sure whether flex was ever really required. Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/htmlcxx/Manifest| 1 + dev-cpp/htmlcxx/htmlcxx-0.87.ebuild | 29 + 2 files changed, 30 insertions(+) diff --git a/dev-cpp/htmlcxx/Manifest b/dev-cpp/htmlcxx/Manifest index 8dd6bee776b..d686b34f837 100644 --- a/dev-cpp/htmlcxx/Manifest +++ b/dev-cpp/htmlcxx/Manifest @@ -1 +1,2 @@ DIST htmlcxx-0.86.tar.gz 469416 BLAKE2B 6edd4b7755db6d8911bc4ee6b1b61792b08d6a381971162a77cd3a6c7cb6cdb06e5a4a77b0a815589edab26aec04490a6b6c9edd80199f01304a506c707688b6 SHA512 dcff9c9946e1c3429af2230997c965b89a28a8ee219d8d594800106ff578bb21154e4680c38a09fb5f96cd4051c89cbf16f2151d30be93d4e3d291ff421aafcb +DIST htmlcxx-0.87.tar.gz 477083 BLAKE2B 94977e758b4f2643f39a464094e315c11b78bc957a3eb054e6a7608828345704a82c3ca36c5ac2855054e7570daebb80d8a63639f3a7197344d25f2d16830702 SHA512 391b94c7ea2d17a04d46ac80f8146e6c2b14b289379c40f3d432ed9c0f36222ced6384d725cdecfc352e28c30f11976249b6a3f7133bbee3161a7883d197fca7 diff --git a/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild new file mode 100644 index 000..fdcb01bc5cf --- /dev/null +++ b/dev-cpp/htmlcxx/htmlcxx-0.87.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="A simple non-validating CSS 1 and HTML parser for C++" +HOMEPAGE="http://htmlcxx.sourceforge.net/; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static-libs" + +ECONF_SOURCE="${S}" + +multilib_src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + # libtool archives covered by pkg-config. + find "${D}" -name "*.la" -delete || die + + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/htmlcxx/, dev-cpp/htmlcxx/files/
commit: 0078e475737eeeda82e6c7a23a5f17dbb9af0b54 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 17 09:52:38 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Sep 17 09:53:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0078e475 dev-cpp/htmlcxx: New package, required by lgogdownloader Package-Manager: portage-2.3.0 dev-cpp/htmlcxx/Manifest | 1 + ...rstream-is-deprecated-use-sstream-instead.patch | 56 ++ ..._syntax.y-for-use-with-less-ancient-Bison.patch | 67 ++ dev-cpp/htmlcxx/htmlcxx-0.86.ebuild| 36 dev-cpp/htmlcxx/metadata.xml | 11 5 files changed, 171 insertions(+) diff --git a/dev-cpp/htmlcxx/Manifest b/dev-cpp/htmlcxx/Manifest new file mode 100644 index ..afee069 --- /dev/null +++ b/dev-cpp/htmlcxx/Manifest @@ -0,0 +1 @@ +DIST htmlcxx-0.86.tar.gz 469416 SHA256 07542b5ea2442143b125ba213b6823ff4a23fff352ecdd84bbebe1d154f4f5c1 SHA512 dcff9c9946e1c3429af2230997c965b89a28a8ee219d8d594800106ff578bb21154e4680c38a09fb5f96cd4051c89cbf16f2151d30be93d4e3d291ff421aafcb WHIRLPOOL 8c0fc17cd52db957cd91cb79e1a8d0d2b477a75501e58135244434e8ee472482f4577dc9cc377b45e1ff7febb83fc31e79b454c0875e2f5919bdc9906113003e diff --git a/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch b/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch new file mode 100644 index ..822c1c8 --- /dev/null +++ b/dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch @@ -0,0 +1,56 @@ +From 04fbe8cb7d933699f2a8ac06d89b205d933070c1 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot+Date: Wed, 14 Sep 2016 22:56:14 +0100 +Subject: [PATCH 1/3] strstream is deprecated, use sstream instead + +--- + html/Uri.cc | 2 +- + html/utils.cc | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/html/Uri.cc b/html/Uri.cc +index 4ddb3dd..034d29a 100644 +--- a/html/Uri.cc b/html/Uri.cc +@@ -1,7 +1,7 @@ + #include "Uri.h" + + #include "wincstring.h" +-#include ++#include + #include + #include + #include "tld.h" +diff --git a/html/utils.cc b/html/utils.cc +index 37ee889..e56cbaf 100644 +--- a/html/utils.cc b/html/utils.cc +@@ -1,7 +1,7 @@ + #include + #include + #include +-#include ++#include + #include "Uri.h" + + #include "utils.h" +@@ -509,7 +509,7 @@ namespace htmlcxx { + string __serialize_gml(const tree , tree::iterator it, tree::iterator end, unsigned int parent_id, unsigned int& label) { + + using namespace std; +- ostrstream ret; ++ ostringstream ret; + tree::sibling_iterator sib = tr.begin(it); + while(sib != tr.end(it)) { + ret << "node [ id " << ++label << "\n label \"" << label << "\"\n]\n"; +@@ -519,7 +519,6 @@ namespace htmlcxx { + } + ret << ends; + string str = ret.str(); +- ret.freeze(0); + return str; + } + +-- +2.8.2 + diff --git a/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch b/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch new file mode 100644 index ..c387dee --- /dev/null +++ b/dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch @@ -0,0 +1,67 @@ +From 807081583ea58b07a5ff2e0659f4173492befb8a Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Wed, 14 Sep 2016 22:56:35 +0100 +Subject: [PATCH 2/3] Update css_syntax.y for use with less ancient Bison + +New pregenerated css_syntax.c to follow. +--- + css/css_syntax.y | 24 +++- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/css/css_syntax.y b/css/css_syntax.y +index e75720d..0d9b177 100644 +--- a/css/css_syntax.y b/css/css_syntax.y +@@ -4,13 +4,13 @@ + #include "css_lex.h" + #include "parser.h" + +-#define YYPARSE_PARAM yyparam + #define YYERROR_VERBOSE 1 + //#define YYDEBUG 1 + + %} + +-%pure_parser ++%parse-param {void *yyparam} ++%pure-parser + + %union { + char *lexeme; +@@ -22,6 +22,19 @@ + int pseudo_element; + } + ++%{ ++ ++int yylex(YYSTYPE *lvalp); ++ ++int yyerror(void *yyparam, const char *s) { ++#if YYDEBUG ++ fprintf(stderr, "Error: %s\n", s); ++#endif ++ return 0; ++} ++ ++%} ++ + %token IMPORT_SYM + %token IMPORTANT_SYM + %token IDENT +@@ -571,13 +584,6 @@ hexcolor + + %% + +-int yyerror(char *s) { +-#if YYDEBUG +- fprintf(stderr, "Error: %s\n", s); +-#endif +- return 0; +-} +- + struct selector_list_t* css_parse(const char *buffer, int buf_len) { + struct selector_list_t *ret = NULL; + //yydebug = 1; +-- +2.8.2 +