| 1 |
grozin 14/03/30 09:00:59 |
| 2 |
|
| 3 |
Added: gcl-readline-6.3.patch gcl-gmp-6.patch |
| 4 |
gcl-tcl-8.6.patch |
| 5 |
Removed: tcl.patch |
| 6 |
Log: |
| 7 |
New patches to gcl-2.6.10 for compatibility with readline-6.3 and gmp-6 |
| 8 |
|
| 9 |
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-lisp/gcl/files/gcl-readline-6.3.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-readline-6.3.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-readline-6.3.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: gcl-readline-6.3.patch |
| 18 |
=================================================================== |
| 19 |
diff -r -U1 gcl.orig/o/gcl_readline.d gcl/o/gcl_readline.d |
| 20 |
--- gcl.orig/o/gcl_readline.d 2013-11-11 21:55:48.000000000 +0700 |
| 21 |
+++ gcl/o/gcl_readline.d 2014-03-30 18:29:42.131967005 +0700 |
| 22 |
@@ -53,2 +53,9 @@ |
| 23 |
|
| 24 |
+/* Deprecated CPPFunction disappeared in libreadline-6.3 */ |
| 25 |
+#if defined(_RL_FUNCTION_TYPEDEF) |
| 26 |
+#define RL_COMPLETION_FUNC_T rl_completion_func_t |
| 27 |
+#else |
| 28 |
+#define RL_COMPLETION_FUNC_T CPPFunction |
| 29 |
+#endif |
| 30 |
+ |
| 31 |
int readline_on = 0; /* On (1) or off (0) */ |
| 32 |
@@ -471,3 +478,3 @@ |
| 33 |
#ifdef RL_COMPLETION |
| 34 |
- rl_attempted_completion_function = (CPPFunction *)rl_completion; |
| 35 |
+ rl_attempted_completion_function = (RL_COMPLETION_FUNC_T *)rl_completion; |
| 36 |
#endif |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 dev-lisp/gcl/files/gcl-gmp-6.patch |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-gmp-6.patch?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-gmp-6.patch?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: gcl-gmp-6.patch |
| 46 |
=================================================================== |
| 47 |
diff -r -U1 gcl.orig/configure gcl/configure |
| 48 |
--- gcl.orig/configure 2013-11-11 21:55:48.000000000 +0700 |
| 49 |
+++ gcl/configure 2014-03-30 17:25:04.874994142 +0700 |
| 50 |
@@ -5027,3 +5027,3 @@ |
| 51 |
int main() { |
| 52 |
- #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 |
| 53 |
+ #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 || __GNU_MP_VERSION == 6 |
| 54 |
return 0; |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 dev-lisp/gcl/files/gcl-tcl-8.6.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-tcl-8.6.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-tcl-8.6.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: gcl-tcl-8.6.patch |
| 64 |
=================================================================== |
| 65 |
diff --git a/gcl/gcl-tk/tkMain.c b/gcl/gcl-tk/tkMain.c |
| 66 |
index 74475cc..21c6c59 100755 |
| 67 |
--- a/gcl/gcl-tk/tkMain.c |
| 68 |
+++ b/gcl/gcl-tk/tkMain.c |
| 69 |
@@ -42,6 +42,11 @@ |
| 70 |
#if (TK_MINOR_VERSION==0 && TK_MAJOR_VERSION==4) |
| 71 |
#define TkCreateMainWindow Tk_CreateMainWindow |
| 72 |
#endif |
| 73 |
+#if TCL_MAJOR_VERSION >= 8 |
| 74 |
+#define INTERP_RESULT(interp) Tcl_GetStringResult(interp) |
| 75 |
+#else |
| 76 |
+#define INTERP_RESULT(interp) (interp)->result |
| 77 |
+#endif |
| 78 |
|
| 79 |
|
| 80 |
/*-------------------------------------------------------------------*/ |
| 81 |
@@ -276,7 +281,7 @@ TkX_Wish (argc, argv) |
| 82 |
|
| 83 |
if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (void *)argv, argTable, 0) |
| 84 |
!= TCL_OK) { |
| 85 |
- fprintf(stderr, "%s\n", interp->result); |
| 86 |
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); |
| 87 |
exit(1); |
| 88 |
} |
| 89 |
if (name == NULL) { |
| 90 |
@@ -309,7 +314,7 @@ TkX_Wish (argc, argv) |
| 91 |
|
| 92 |
/* mainWindow = TkCreateMainWindow(interp, display, name/\* , "Tk" *\/); */ |
| 93 |
/* if (mainWindow == NULL) { */ |
| 94 |
-/* fprintf(stderr, "%s\n", interp->result); */ |
| 95 |
+/* fprintf(stderr, "%s\n", INTERP_RESULT(interp)); */ |
| 96 |
/* exit(1); */ |
| 97 |
/* } */ |
| 98 |
/* #ifndef __MINGW32__ */ |
| 99 |
@@ -362,7 +367,7 @@ TkX_Wish (argc, argv) |
| 100 |
Tcl_FindExecutable ( argv[0] ); |
| 101 |
#else |
| 102 |
if (Tcl_AppInit(interp) != TCL_OK) { |
| 103 |
- fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result); |
| 104 |
+ fprintf(stderr, "Tcl_AppInit failed: %s\n", INTERP_RESULT(interp)); |
| 105 |
} |
| 106 |
#endif |
| 107 |
/* |
| 108 |
@@ -372,7 +377,7 @@ TkX_Wish (argc, argv) |
| 109 |
if (geometry != NULL) { |
| 110 |
code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL); |
| 111 |
if (code != TCL_OK) { |
| 112 |
- fprintf(stderr, "%s\n", interp->result); |
| 113 |
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); |
| 114 |
} |
| 115 |
} |
| 116 |
|
| 117 |
@@ -402,13 +407,13 @@ TkX_Wish (argc, argv) |
| 118 |
|
| 119 |
fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer); |
| 120 |
if (fullName == NULL) { |
| 121 |
- fprintf(stderr, "%s\n", interp->result); |
| 122 |
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); |
| 123 |
} else { |
| 124 |
f = fopen(fullName, "r"); |
| 125 |
if (f != NULL) { |
| 126 |
code = Tcl_EvalFile(interp, fullName); |
| 127 |
if (code != TCL_OK) { |
| 128 |
- fprintf(stderr, "%s\n", interp->result); |
| 129 |
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); |
| 130 |
} |
| 131 |
fclose(f); |
| 132 |
} |
| 133 |
@@ -443,7 +448,7 @@ TkX_Wish (argc, argv) |
| 134 |
error: |
| 135 |
msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); |
| 136 |
if (msg == NULL) { |
| 137 |
- msg = interp->result; |
| 138 |
+ msg = INTERP_RESULT(interp); |
| 139 |
} |
| 140 |
dfprintf(stderr, "%s\n", msg); |
| 141 |
Tcl_Eval(interp, errorExitCmd); |
| 142 |
@@ -566,13 +571,13 @@ StdinProc(clientData, mask) |
| 143 |
|| code) |
| 144 |
{ |
| 145 |
char buf[4]; |
| 146 |
- char *p = buf; |
| 147 |
+ char *p = buf, *string; |
| 148 |
/*header */ |
| 149 |
*p++ = (code ? '1' : '0'); |
| 150 |
bcopy(msg->msg_id,p,3); |
| 151 |
/* end header */ |
| 152 |
- if(sock_write_str2(dsfd, m_reply, buf, 4 , |
| 153 |
- interp->result, strlen(interp->result)) |
| 154 |
+ string = INTERP_RESULT(interp); |
| 155 |
+ if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string)) |
| 156 |
< 0) |
| 157 |
{ /* what do we want to do if the write failed */} |
| 158 |
|
| 159 |
@@ -752,7 +757,7 @@ guiBindCallback(char *szNameCmdProc, char *szTclObject, char *szModifier,char* a |
| 160 |
code = Tcl_Eval(interp, szCmd); |
| 161 |
if (code != TCL_OK) |
| 162 |
{ |
| 163 |
- dfprintf(stderr, "TCL Error int bind : %s\n", interp->result); |
| 164 |
+ dfprintf(stderr, "TCL Error int bind : %s\n", INTERP_RESULT(interp)); |
| 165 |
|
| 166 |
} |
| 167 |
return code; |
Archives