diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-lang/maude/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-lang/maude/files')
-rw-r--r-- | dev-lang/maude/files/maude-2.5.0-prll.patch | 24 | ||||
-rw-r--r-- | dev-lang/maude/files/maude-2.6-search-datadir.patch | 37 | ||||
-rw-r--r-- | dev-lang/maude/files/maude-2.7-bison-parse-param.patch | 39 |
3 files changed, 0 insertions, 100 deletions
diff --git a/dev-lang/maude/files/maude-2.5.0-prll.patch b/dev-lang/maude/files/maude-2.5.0-prll.patch deleted file mode 100644 index 5499af3eb764..000000000000 --- a/dev-lang/maude/files/maude-2.5.0-prll.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/Mixfix/Makefile.am b/src/Mixfix/Makefile.am -index d811631..295f0c6 100644 ---- a/src/Mixfix/Makefile.am -+++ b/src/Mixfix/Makefile.am -@@ -72,7 +72,7 @@ libmixfix_a_SOURCES = \ - EXTRA_libmixfix_a_SOURCES = \ - compiler.cc - --BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc -+BUILT_SOURCES = surface.cc lexer.cc - CLEANFILES = surface.yy surface.cc surface.h lexer.cc - - surface.yy: \ -@@ -87,7 +87,9 @@ surface.yy: \ - $(srcdir)/bottom.yy \ - > surface.yy - --surface.cc surface.h: surface.yy -+surface.h: surface.yy -+ -+surface.cc: surface.h - $(BISON) -dv surface.yy -o surface.c - mv surface.c surface.cc - diff --git a/dev-lang/maude/files/maude-2.6-search-datadir.patch b/dev-lang/maude/files/maude-2.6-search-datadir.patch deleted file mode 100644 index f5522eda2a05..000000000000 --- a/dev-lang/maude/files/maude-2.6-search-datadir.patch +++ /dev/null @@ -1,37 +0,0 @@ -Have maude search in datadir for its files. ---- a/src/Main/main.cc -+++ b/src/Main/main.cc -@@ -263,6 +263,11 @@ - { - if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK)) - return true; -+ if (directoryManager.checkAccess(DATADIR, fileName, R_OK)) -+ { -+ directory = DATADIR; -+ return true; -+ } - if (!(executableDirectory.empty()) && - directoryManager.checkAccess(executableDirectory, fileName, R_OK)) - { ---- a/src/Mixfix/global.cc -+++ b/src/Mixfix/global.cc -@@ -83,6 +83,9 @@ - return true; - if (directoryManager.searchPath(MAUDE_LIB, directory, fileName, R_OK, ext)) - return true; -+ directory = DATADIR; -+ if (directoryManager.checkAccess(directory, fileName, R_OK, ext)) -+ return true; - if (!(executableDirectory.empty()) && - directoryManager.checkAccess(executableDirectory, fileName, R_OK, ext)) - { ---- a/src/Mixfix/global.hh -+++ b/src/Mixfix/global.hh -@@ -36,6 +36,7 @@ - - #define PRELUDE_NAME "prelude.maude" - #define MAUDE_LIB "MAUDE_LIB" -+#define DATADIR "/usr/share/maude" - - bool - findPrelude(string& directory, string& fileName); diff --git a/dev-lang/maude/files/maude-2.7-bison-parse-param.patch b/dev-lang/maude/files/maude-2.7-bison-parse-param.patch deleted file mode 100644 index 2aa77f01c4e8..000000000000 --- a/dev-lang/maude/files/maude-2.7-bison-parse-param.patch +++ /dev/null @@ -1,39 +0,0 @@ -Author: Jakub Wilk <jwilk@debian.org> -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); |