Author: viric Date: Wed Mar 7 22:12:12 2012 New Revision: 32866 URL: https://nixos.org/websvn/nix/?rev=32866&sc=1
Log: Adding patches for cdecl to build. I picked them from: http://gentoo-overlays.zugaina.org/gentoo/portage/dev-util/cdecl/files/ Added: nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch Modified: nixpkgs/trunk/pkgs/development/tools/cdecl/default.nix Added: nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch Wed Mar 7 22:12:12 2012 (r32866) @@ -0,0 +1,29 @@ +--- a/cdecl.c 2009-07-07 13:20:37.000000000 +0200 ++++ a/cdecl.c.new 2009-07-07 13:25:00.000000000 +0200 +@@ -91,7 +91,7 @@ + #ifdef USE_READLINE + # include <readline/readline.h> + /* prototypes for functions related to readline() */ +- char * getline(); ++ char * mygetline(); + char ** attempt_completion(char *, int, int); + char * keyword_completion(char *, int); + char * command_completion(char *, int); +@@ -375,7 +375,7 @@ + static char *line_read = NULL; + + /* Read a string, and return a pointer to it. Returns NULL on EOF. */ +-char * getline () ++char * mygetline () + { + /* If the buffer has already been allocated, return the memory + to the free pool. */ +@@ -887,7 +887,7 @@ + + if (!quiet) (void) printf("Type `help' or `?' for help\n"); + ret = 0; +- while ((line = getline())) { ++ while ((line = mygetline())) { + if (!strcmp(line, "quit") || !strcmp(line, "exit")) { + free(line); + return ret; Added: nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch Wed Mar 7 22:12:12 2012 (r32866) @@ -0,0 +1,12 @@ +Index: cdecl-2.5/cdecl.c +=================================================================== +--- cdecl-2.5.orig/cdecl.c ++++ cdecl-2.5/cdecl.c +@@ -204,6 +204,7 @@ int DebugFlag = 0; /* -d, output debugg + #define ANSI 4 /* combo not allowed anymore in ANSI compiler */ + #define A ANSI + ++extern char **completion_matches PARAMS((char *, rl_compentry_func_t *)); + /* This is an lower left triangular array. If we needed */ + /* to save 9 bytes, the "long" row can be removed. */ + char crosscheck[9][9] = { \ No newline at end of file Modified: nixpkgs/trunk/pkgs/development/tools/cdecl/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/tools/cdecl/default.nix Wed Mar 7 22:06:29 2012 (r32865) +++ nixpkgs/trunk/pkgs/development/tools/cdecl/default.nix Wed Mar 7 22:12:12 2012 (r32866) @@ -7,7 +7,7 @@ md5 = "29895dab52e85b2474a59449e07b7996"; }; - patches = [ ./cdecl-2.5.patch ]; + patches = [ ./cdecl-2.5-implicit-pointer.patch ./cdecl-2.5.patch ./cdecl-2.5-gentoo.patch ]; preBuild = " makeFlags=\"PREFIX=$out\" "; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
