Hello community, here is the log from the commit of package pwlib for openSUSE:Factory checked in at 2015-01-24 22:20:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pwlib (Old) and /work/SRC/openSUSE:Factory/.pwlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pwlib" Changes: -------- --- /work/SRC/openSUSE:Factory/pwlib/pwlib.changes 2013-12-23 22:18:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pwlib.new/pwlib.changes 2015-01-24 22:20:29.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 22 08:23:36 UTC 2015 - [email protected] + +- Add pwlib-bison-3.0.patch: Fix build with Bison 3.0. + +------------------------------------------------------------------- New: ---- pwlib-bison-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwlib.spec ++++++ --- /var/tmp/diff_new_pack.gXhk8D/_old 2015-01-24 22:20:30.000000000 +0100 +++ /var/tmp/diff_new_pack.gXhk8D/_new 2015-01-24 22:20:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pwlib # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,7 @@ Patch6: pwlib-gcc47.patch Patch7: aarch64-support.patch Patch8: ppc64le-support.patch +Patch9: pwlib-bison-3.0.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: automake @@ -119,6 +120,7 @@ %patch6 -p1 %patch7 %patch8 -p1 +%patch9 -p0 %build #autoreconf --force --install ++++++ pwlib-bison-3.0.patch ++++++ --- src/ptlib/common/getdate.y.orig 2007-10-19 06:22:32 UTC +++ src/ptlib/common/getdate.y @@ -106,8 +106,6 @@ struct Variables { #define YYPURE 1 -#define YYLEX_PARAM VARIABLE->yyInput -#define YYPARSE_PARAM parseParam #define yyparse PTime_yyparse #define yylex PTime_yylex @@ -117,9 +115,9 @@ static int yyparse(void *); static int yylex(); #ifdef __GNUC__ -static int yyerror(); +static int yyerror(void *, char const *msg); #else -static void yyerror(); +static void yyerror(void *, char const *msg); #endif @@ -129,6 +127,8 @@ static void SetPossibleDate(struct Varia %} %pure_parser +%parse-param {void *parseParam} +%lex-param {void *parseParam} %union { time_t Number; @@ -718,22 +718,22 @@ static int LookupWord(char * buff, YYSTY #ifndef __GNUC__ static #endif -int yylex(YYSTYPE * yylval, void * yyInput) +int yylex(YYSTYPE * yylval, struct Variables * vars) { register char *p; char buff[20]; int Count; int sign; - register int c = PTimeGetChar(yyInput); + register int c = PTimeGetChar(vars->yyInput); while (c != EOF && c != '\0' && c != '\n') { while (isspace(c)) - c = PTimeGetChar(yyInput); + c = PTimeGetChar(vars->yyInput); if (isdigit(c) || c == '-' || c == '+') { if (c == '-' || c == '+') { sign = c == '-' ? -1 : 1; - if (!isdigit(c = PTimeGetChar(yyInput))) + if (!isdigit(c = PTimeGetChar(vars->yyInput))) /* skip the '-' sign */ continue; } @@ -743,10 +743,10 @@ int yylex(YYSTYPE * yylval, void * yyInp Count = 0; /* Count number of digits */ while (isdigit(c)) { yylval->Number = 10 * yylval->Number + c - '0'; - c = PTimeGetChar(yyInput); + c = PTimeGetChar(vars->yyInput); Count++; } - PTimeUngetChar(yyInput, c); + PTimeUngetChar(vars->yyInput, c); if (sign < 0) yylval->Number = -yylval->Number; if (sign) @@ -759,12 +759,12 @@ int yylex(YYSTYPE * yylval, void * yyInp } if (isalpha(c)) { - for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(yyInput)) { + for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) { if (p < &buff[sizeof(buff)-1]) *p++ = (char)c; } *p = '\0'; - PTimeUngetChar(yyInput, c); + PTimeUngetChar(vars->yyInput, c); return LookupWord(buff, yylval); } @@ -773,7 +773,7 @@ int yylex(YYSTYPE * yylval, void * yyInp Count = 0; do { - c = PTimeGetChar(yyInput); + c = PTimeGetChar(vars->yyInput); if (c == '\0' || c == EOF) return c; if (c == '(') @@ -1008,12 +1008,12 @@ time_t STDAPICALLTYPE PTimeParse(void * #endif #ifdef __GNUC__ -int yyerror(const char * s) +int yyerror(void *var, const char * s) { return 0; } #else -static void yyerror(const char * s) +static void yyerror(void *var, const char * s) { } #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
