Author: tille Date: 2014-05-20 12:13:19 +0000 (Tue, 20 May 2014) New Revision: 16962
Added: trunk/packages/maude/trunk/debian/patches/bison-parse-param.patch trunk/packages/maude/trunk/debian/patches/getinput-size_t.patch trunk/packages/maude/trunk/debian/patches/lexbubble-semicolons.patch Modified: trunk/packages/maude/trunk/debian/changelog trunk/packages/maude/trunk/debian/control trunk/packages/maude/trunk/debian/patches/series Log: Three helpful pathces provided by Jakub Wilk to deal with bison problems - many thanks to Jakub! Modified: trunk/packages/maude/trunk/debian/changelog =================================================================== --- trunk/packages/maude/trunk/debian/changelog 2014-05-19 23:13:19 UTC (rev 16961) +++ trunk/packages/maude/trunk/debian/changelog 2014-05-20 12:13:19 UTC (rev 16962) @@ -1,3 +1,12 @@ +maude (2.6-5) UNRELEASED; urgency=medium + + * move debian/upstream to debian/upstream/metadata + * Three helpful pathces provided by Jakub Wilk to deal with bison + problems - many thanks to Jakub! + Closes: #733407 + + -- Andreas Tille <[email protected]> Tue, 20 May 2014 14:02:43 +0200 + maude (2.6-4) unstable; urgency=low * debian/rules: dh --with autotools_dev Modified: trunk/packages/maude/trunk/debian/control =================================================================== --- trunk/packages/maude/trunk/debian/control 2014-05-19 23:13:19 UTC (rev 16961) +++ trunk/packages/maude/trunk/debian/control 2014-05-20 12:13:19 UTC (rev 16962) @@ -11,7 +11,7 @@ libgmp3-dev, libsigsegv-dev, bison, - flex, + flex (>= 2.5.36), libncurses5-dev Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/maude/trunk/ Added: trunk/packages/maude/trunk/debian/patches/bison-parse-param.patch =================================================================== --- trunk/packages/maude/trunk/debian/patches/bison-parse-param.patch (rev 0) +++ trunk/packages/maude/trunk/debian/patches/bison-parse-param.patch 2014-05-20 12:13:19 UTC (rev 16962) @@ -0,0 +1,39 @@ +Author: Jakub Wilk <[email protected]> +Last-Update: Tue, 20 May 2014 13:35:26 +0200 +Bug-Debian: http://bugs.debian.org/733407 +Description: this is quick and dirty patch to use %parse-param instead + of deprecated YYPARSE_PARAM (and eventually removed in Bison 3.0). + %parse-param was added in bison 1.875, over a decade ago, so no + Build-Depends adjustments are needed. :-) + +--- a/src/Mixfix/top.yy ++++ b/src/Mixfix/top.yy +@@ -24,6 +24,8 @@ + // Parser for Maude surface syntax. + // + ++%parse-param {void* YYPARSE_PARAM} ++ + %{ + #include <string> + #include <stack> +@@ -91,7 +93,7 @@ SyntaxContainer* oldSyntaxContainer = 0; + Int64 number; + Int64 number2; + +-static void yyerror(char *s); ++static void yyerror(void *, char *s); + + void cleanUpModuleExpression(); + void cleanUpParser(); +--- a/src/Mixfix/bottom.yy ++++ b/src/Mixfix/bottom.yy +@@ -23,7 +23,7 @@ + %% + + static void +-yyerror(char *s) ++yyerror(void *, char *s) + { + if (!(UserLevelRewritingContext::interrupted())) + IssueWarning(LineNumber(lineNumber) << ": " << s); Added: trunk/packages/maude/trunk/debian/patches/getinput-size_t.patch =================================================================== --- trunk/packages/maude/trunk/debian/patches/getinput-size_t.patch (rev 0) +++ trunk/packages/maude/trunk/debian/patches/getinput-size_t.patch 2014-05-20 12:13:19 UTC (rev 16962) @@ -0,0 +1,85 @@ +Author: Jakub Wilk <[email protected]> +Last-Update: Tue, 20 May 2014 13:35:26 +0200 +Bug-Debian: http://bugs.debian.org/733407 +Description: Types of the arguments for YY_INPUT has changed from int to + yy_size_t (which is a typedef for size_t), which caused the following error: + . + <stdout>: In function 'int yy_get_next_buffer()': + ./lexer.ll:56:72: error: invalid initialization of reference of type 'int&' from expression of type 'yy_size_t {aka unsigned int}' + . + This patch adjusts the types. This change requires bumping build-dependency + on flex to >= 2.5.36. + +--- a/src/IO_Stuff/IO_Manager.cc ++++ b/src/IO_Stuff/IO_Manager.cc +@@ -85,8 +85,8 @@ IO_Manager::setAutoWrap() + (void) cerr.rdbuf(wrapErr); + } + +-int +-IO_Manager::getInput(char* buf, int maxSize, FILE* stream) ++size_t ++IO_Manager::getInput(char* buf, size_t maxSize, FILE* stream) + { + if (stream != stdin) + { +@@ -118,7 +118,7 @@ IO_Manager::getInput(char* buf, int maxS + return 0; + } + +- int n; ++ size_t n; + for (n = 0;; n++) + { + char c = *line; +--- a/src/Mixfix/lexerAux.cc ++++ b/src/Mixfix/lexerAux.cc +@@ -23,6 +23,9 @@ + // + // Auxiliary functions and data needed by lexical analyzer. + // ++ ++#include <stddef.h> ++ + #define MAX_IN_DEPTH 10 + + int inStackPtr = 0; +@@ -35,14 +38,14 @@ bool fakeNewline = false; // fake \n fo + bool fakeNewlineStack[MAX_IN_DEPTH]; + + void +-getInput(char* buf, int& result, int max_size) ++getInput(char* buf, size_t& result, size_t max_size) + { + result = YY_NULL; + if (UserLevelRewritingContext::interrupted()) + fakeNewline = false; + else + { +- int n = ioManager.getInput(buf, max_size, yyin); ++ size_t n = ioManager.getInput(buf, max_size, yyin); + if (UserLevelRewritingContext::interrupted()) + fakeNewline = false; + else +--- a/src/Mixfix/lexerAux.hh ++++ b/src/Mixfix/lexerAux.hh +@@ -27,7 +27,7 @@ + //extern int inStackPtr; + //extern YY_BUFFER_STATE inStack[]; + +-void getInput(char* buf, int& result, int max_size); ++void getInput(char* buf, size_t& result, size_t max_size); + void lexerIdMode(); + void lexerTokenTreeMode(int terminatingTokens); + void lexerCmdMode(); +--- a/src/IO_Stuff/IO_Manager.hh ++++ b/src/IO_Stuff/IO_Manager.hh +@@ -49,7 +49,7 @@ public: + void setPrompt(const string& newPrompt); + void setContPrompt(const string& newContPrompt); + void startCommand(); +- int getInput(char* buf, int maxSize, FILE* stream); ++ size_t getInput(char* buf, size_t maxSize, FILE* stream); + + private: + GetLine* gl; Added: trunk/packages/maude/trunk/debian/patches/lexbubble-semicolons.patch =================================================================== --- trunk/packages/maude/trunk/debian/patches/lexbubble-semicolons.patch (rev 0) +++ trunk/packages/maude/trunk/debian/patches/lexbubble-semicolons.patch 2014-05-20 12:13:19 UTC (rev 16962) @@ -0,0 +1,35 @@ +Author: Jakub Wilk <[email protected]> +Last-Update: Tue, 20 May 2014 13:35:26 +0200 +Bug-Debian: http://bugs.debian.org/733407 +Description: fix yet another build error: + surface.yy: In function 'int yyparse(void*)': + surface.yy:575:4: error: expected ';' before '}' token + +--- a/src/Mixfix/commands.yy ++++ b/src/Mixfix/commands.yy +@@ -23,12 +23,12 @@ + /* + * Commands. + */ +-command : KW_SELECT { lexBubble(END_COMMAND, 1) } ++command : KW_SELECT { lexBubble(END_COMMAND, 1); } + endBubble + { + interpreter.setCurrentModule(lexerBubble); + } +- | KW_DUMP { lexBubble(END_COMMAND, 1) } ++ | KW_DUMP { lexBubble(END_COMMAND, 1); } + endBubble + { + if (interpreter.setCurrentModule(lexerBubble)) +--- a/src/Mixfix/modules.yy ++++ b/src/Mixfix/modules.yy +@@ -247,7 +247,7 @@ viewEndOpMap : ':' + // press on. + // + opDescription = lexerBubble; +- lexBubble(END_STATEMENT, 1) ++ lexBubble(END_STATEMENT, 1); + } + endBubble + { Modified: trunk/packages/maude/trunk/debian/patches/series =================================================================== --- trunk/packages/maude/trunk/debian/patches/series 2014-05-19 23:13:19 UTC (rev 16961) +++ trunk/packages/maude/trunk/debian/patches/series 2014-05-20 12:13:19 UTC (rev 16962) @@ -1 +1,4 @@ search-datadir.patch +bison-parse-param.patch +getinput-size_t.patch +lexbubble-semicolons.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
