grozin 14/03/30 09:00:59
Added: gcl-readline-6.3.patch gcl-gmp-6.patch
gcl-tcl-8.6.patch
Removed: tcl.patch
Log:
New patches to gcl-2.6.10 for compatibility with readline-6.3 and gmp-6
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key
0x3AFFCE974D34BD8C!)
Revision Changes Path
1.1 dev-lisp/gcl/files/gcl-readline-6.3.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-readline-6.3.patch?rev=1.1&view=markup
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
Index: gcl-readline-6.3.patch
===================================================================
diff -r -U1 gcl.orig/o/gcl_readline.d gcl/o/gcl_readline.d
--- gcl.orig/o/gcl_readline.d 2013-11-11 21:55:48.000000000 +0700
+++ gcl/o/gcl_readline.d 2014-03-30 18:29:42.131967005 +0700
@@ -53,2 +53,9 @@
+/* Deprecated CPPFunction disappeared in libreadline-6.3 */
+#if defined(_RL_FUNCTION_TYPEDEF)
+#define RL_COMPLETION_FUNC_T rl_completion_func_t
+#else
+#define RL_COMPLETION_FUNC_T CPPFunction
+#endif
+
int readline_on = 0; /* On (1) or off (0) */
@@ -471,3 +478,3 @@
#ifdef RL_COMPLETION
- rl_attempted_completion_function = (CPPFunction *)rl_completion;
+ rl_attempted_completion_function = (RL_COMPLETION_FUNC_T *)rl_completion;
#endif
1.1 dev-lisp/gcl/files/gcl-gmp-6.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-gmp-6.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-gmp-6.patch?rev=1.1&content-type=text/plain
Index: gcl-gmp-6.patch
===================================================================
diff -r -U1 gcl.orig/configure gcl/configure
--- gcl.orig/configure 2013-11-11 21:55:48.000000000 +0700
+++ gcl/configure 2014-03-30 17:25:04.874994142 +0700
@@ -5027,3 +5027,3 @@
int main() {
- #if __GNU_MP_VERSION == 4 ||
__GNU_MP_VERSION == 5
+ #if __GNU_MP_VERSION == 4 ||
__GNU_MP_VERSION == 5 || __GNU_MP_VERSION == 6
return 0;
1.1 dev-lisp/gcl/files/gcl-tcl-8.6.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/gcl/files/gcl-tcl-8.6.patch?rev=1.1&view=markup
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
Index: gcl-tcl-8.6.patch
===================================================================
diff --git a/gcl/gcl-tk/tkMain.c b/gcl/gcl-tk/tkMain.c
index 74475cc..21c6c59 100755
--- a/gcl/gcl-tk/tkMain.c
+++ b/gcl/gcl-tk/tkMain.c
@@ -42,6 +42,11 @@
#if (TK_MINOR_VERSION==0 && TK_MAJOR_VERSION==4)
#define TkCreateMainWindow Tk_CreateMainWindow
#endif
+#if TCL_MAJOR_VERSION >= 8
+#define INTERP_RESULT(interp) Tcl_GetStringResult(interp)
+#else
+#define INTERP_RESULT(interp) (interp)->result
+#endif
/*-------------------------------------------------------------------*/
@@ -276,7 +281,7 @@ TkX_Wish (argc, argv)
if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (void *)argv, argTable,
0)
!= TCL_OK) {
- fprintf(stderr, "%s\n", interp->result);
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp));
exit(1);
}
if (name == NULL) {
@@ -309,7 +314,7 @@ TkX_Wish (argc, argv)
/* mainWindow = TkCreateMainWindow(interp, display, name/\* , "Tk" *\/);
*/
/* if (mainWindow == NULL) { */
-/* fprintf(stderr, "%s\n", interp->result); */
+/* fprintf(stderr, "%s\n", INTERP_RESULT(interp)); */
/* exit(1); */
/* } */
/* #ifndef __MINGW32__ */
@@ -362,7 +367,7 @@ TkX_Wish (argc, argv)
Tcl_FindExecutable ( argv[0] );
#else
if (Tcl_AppInit(interp) != TCL_OK) {
- fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
+ fprintf(stderr, "Tcl_AppInit failed: %s\n", INTERP_RESULT(interp));
}
#endif
/*
@@ -372,7 +377,7 @@ TkX_Wish (argc, argv)
if (geometry != NULL) {
code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
if (code != TCL_OK) {
- fprintf(stderr, "%s\n", interp->result);
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp));
}
}
@@ -402,13 +407,13 @@ TkX_Wish (argc, argv)
fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
if (fullName == NULL) {
- fprintf(stderr, "%s\n", interp->result);
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp));
} else {
f = fopen(fullName, "r");
if (f != NULL) {
code = Tcl_EvalFile(interp, fullName);
if (code != TCL_OK) {
- fprintf(stderr, "%s\n", interp->result);
+ fprintf(stderr, "%s\n", INTERP_RESULT(interp));
}
fclose(f);
}
@@ -443,7 +448,7 @@ TkX_Wish (argc, argv)
error:
msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
if (msg == NULL) {
- msg = interp->result;
+ msg = INTERP_RESULT(interp);
}
dfprintf(stderr, "%s\n", msg);
Tcl_Eval(interp, errorExitCmd);
@@ -566,13 +571,13 @@ StdinProc(clientData, mask)
|| code)
{
char buf[4];
- char *p = buf;
+ char *p = buf, *string;
/*header */
*p++ = (code ? '1' : '0');
bcopy(msg->msg_id,p,3);
/* end header */
- if(sock_write_str2(dsfd, m_reply, buf, 4 ,
- interp->result, strlen(interp->result))
+ string = INTERP_RESULT(interp);
+ if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string))
< 0)
{ /* what do we want to do if the write failed */}
@@ -752,7 +757,7 @@ guiBindCallback(char *szNameCmdProc, char *szTclObject,
char *szModifier,char* a
code = Tcl_Eval(interp, szCmd);
if (code != TCL_OK)
{
- dfprintf(stderr, "TCL Error int bind : %s\n", interp->result);
+ dfprintf(stderr, "TCL Error int bind : %s\n", INTERP_RESULT(interp));
}
return code;
