diff options
Diffstat (limited to 'dev-cpp/htmlcxx/files')
| -rw-r--r-- | dev-cpp/htmlcxx/files/0001-strstream-is-deprecated-use-sstream-instead.patch | 56 | ||||
| -rw-r--r-- | dev-cpp/htmlcxx/files/0002-Update-css_syntax.y-for-use-with-less-ancient-Bison.patch | 67 |
2 files changed, 123 insertions, 0 deletions
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 000000000000..822c1c8e41a2 --- /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 <chewi@gentoo.org> +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 <strstream> ++#include <sstream> + #include <cstdlib> + #include <cassert> + #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 <algorithm> + #include <cctype> + #include <cstring> +-#include <strstream> ++#include <sstream> + #include "Uri.h" + + #include "utils.h" +@@ -509,7 +509,7 @@ namespace htmlcxx { + string __serialize_gml(const tree<HTML::Node> &tr, tree<HTML::Node>::iterator it, tree<HTML::Node>::iterator end, unsigned int parent_id, unsigned int& label) { + + using namespace std; +- ostrstream ret; ++ ostringstream ret; + tree<HTML::Node>::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 000000000000..c387deeca7f1 --- /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 <chewi@gentoo.org> +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 + |