* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/
@ 2017-03-03 12:12 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-03-03 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 1a54f9a1015c47079fa8a49586b1ecbc03d40482
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 3 12:07:20 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 12:07:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a54f9a1
dev-ml/labltk: Fix build with ocaml 4.05
Package-Manager: Portage-2.3.4, Repoman-2.3.2
dev-ml/labltk/files/ocaml405.patch | 382 +++++++++++++++++++++++++++++++++++++
dev-ml/labltk/labltk-8.06.2.ebuild | 1 +
2 files changed, 383 insertions(+)
diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch
new file mode 100644
index 00000000000..8503646f71e
--- /dev/null
+++ b/dev-ml/labltk/files/ocaml405.patch
@@ -0,0 +1,382 @@
+Index: labltk-8.06.2/support/cltkCaml.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkCaml.c
++++ labltk-8.06.2/support/cltkCaml.c
+@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl
+ int id;
+ if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK)
+ return TCL_ERROR;
+- callback2(*handler_code,Val_int(id),
++ caml_callback2(*handler_code,Val_int(id),
+ copy_string_list(argc - 2,(char **)&argv[2]));
+ /* Never fails (OCaml would have raised an exception) */
+ /* but result may have been set by callback */
+@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v)
+ /* Note: raise_with_string WILL copy the error message */
+ CAMLprim void tk_error(const char *errmsg)
+ {
+- raise_with_string(*tkerror_exn, errmsg);
++ caml_raise_with_string(*tkerror_exn, errmsg);
+ }
+
+
+Index: labltk-8.06.2/support/cltkDMain.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkDMain.c
++++ labltk-8.06.2/support/cltkDMain.c
+@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client
+ /* Rearm timer */
+ Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
+ signal_events = 1;
+- leave_blocking_section();
++ caml_leave_blocking_section();
+ }
+ /* The following is taken from byterun/startup.c */
+ header_t atom_table[256];
+@@ -222,10 +222,10 @@ int Caml_Init(interp)
+ strcat(f, RCNAME);
+ if (0 == access(f,R_OK))
+ if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
+- stat_free(f);
++ caml_stat_free(f);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(f);
++ caml_stat_free(f);
+ }
+ }
+
+Index: labltk-8.06.2/support/cltkEval.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkEval.c
++++ labltk-8.06.2/support/cltkEval.c
+@@ -45,7 +45,7 @@ value copy_string_list(int argc, char **
+ for (i = argc-1; i >= 0; i--) {
+ oldres = res;
+ str = tcl_string_to_caml(argv[i]);
+- res = alloc(2, 0);
++ res = caml_alloc(2, 0);
+ Field(res, 0) = str;
+ Field(res, 1) = oldres;
+ }
+@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str
+ Tcl_ResetResult(cltclinterp);
+ cmd = caml_string_to_tcl(str);
+ code = Tcl_Eval(cltclinterp, cmd);
+- stat_free(cmd);
++ caml_stat_free(cmd);
+
+ switch (code) {
+ case TCL_OK:
+@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v
+ fill_args(tmpargv,0,Field(v,0));
+ tmpargv[size] = NULL;
+ merged = Tcl_Merge(size,(const char *const*)tmpargv);
+- for(i = 0; i<size; i++){ stat_free(tmpargv[i]); }
+- stat_free((char *)tmpargv);
++ for(i = 0; i<size; i++){ caml_stat_free(tmpargv[i]); }
++ caml_stat_free((char *)tmpargv);
+ /* must be freed by stat_free */
+ argv[where] = (char*)caml_stat_alloc(strlen(merged)+1);
+ strcpy(argv[where], merged);
+@@ -227,10 +227,10 @@ CAMLprim value camltk_tcl_direct_eval(va
+
+ /* Free the various things we allocated */
+ for(i=0; i< size; i ++){
+- stat_free((char *) allocated[i]);
++ caml_stat_free((char *) allocated[i]);
+ }
+- stat_free((char *)argv);
+- stat_free((char *)allocated);
++ caml_stat_free((char *)argv);
++ caml_stat_free((char *)allocated);
+
+ switch (result) {
+ case TCL_OK:
+Index: labltk-8.06.2/support/cltkEvent.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkEvent.c
++++ labltk-8.06.2/support/cltkEvent.c
+@@ -49,6 +49,6 @@ CAMLprim value camltk_dooneevent(value f
+
+ CheckInit();
+
+- ret = Tk_DoOneEvent(convert_flag_list(flags, event_flag_table));
++ ret = Tk_DoOneEvent(caml_convert_flag_list(flags, event_flag_table));
+ return Val_int(ret);
+ }
+Index: labltk-8.06.2/support/cltkFile.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkFile.c
++++ labltk-8.06.2/support/cltkFile.c
+@@ -33,7 +33,7 @@
+
+ void FileProc(ClientData clientdata, int mask)
+ {
+- callback2(*handler_code,Val_int(clientdata),Val_int(0));
++ caml_callback2(*handler_code,Val_int(clientdata),Val_int(0));
+ }
+
+ /* Map Unix.file_descr values to Tcl file handles */
+Index: labltk-8.06.2/support/cltkImg.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkImg.c
++++ labltk-8.06.2/support/cltkImg.c
+@@ -47,7 +47,7 @@ CAMLprim value camltk_getimgdata (value
+
+ code = Tk_PhotoGetImage(ph,&pib); /* never fails ? */
+ size = pib.width * pib.height * pib.pixelSize;
+- res = alloc_string(size);
++ res = caml_alloc_string(size);
+
+ /* no holes, default format ? */
+ if ((pib.pixelSize == 3) &&
+Index: labltk-8.06.2/support/cltkMain.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkMain.c
++++ labltk-8.06.2/support/cltkMain.c
+@@ -51,11 +51,11 @@ int signal_events = 0; /* do we have a p
+ void invoke_pending_caml_signals (ClientData clientdata)
+ {
+ signal_events = 0;
+- enter_blocking_section(); /* triggers signal handling */
++ caml_enter_blocking_section(); /* triggers signal handling */
+ /* Rearm timer */
+ Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
+ signal_events = 1;
+- leave_blocking_section();
++ caml_leave_blocking_section();
+ }
+
+ /* Now the real Tk stuff */
+@@ -77,7 +77,7 @@ CAMLprim value camltk_opentk(value argv)
+ tmp = Val_unit;
+
+ if ( argv == Val_int(0) ){
+- failwith("camltk_opentk: argv is empty");
++ caml_failwith("camltk_opentk: argv is empty");
+ }
+ argv0 = String_val( Field( argv, 0 ) );
+
+@@ -91,7 +91,7 @@ CAMLprim value camltk_opentk(value argv)
+ /* Register cltclinterp for use in other related extensions */
+ value *interp = caml_named_value("cltclinterp");
+ if (interp != NULL)
+- Store_field(*interp,0,copy_nativeint((intnat)cltclinterp));
++ Store_field(*interp,0,caml_copy_nativeint((intnat)cltclinterp));
+ }
+
+ if (Tcl_Init(cltclinterp) != TCL_OK)
+@@ -128,7 +128,7 @@ CAMLprim value camltk_opentk(value argv)
+ args = Tcl_Merge(argc, (const char *const*)tkargv); /* args must be freed by Tcl_Free */
+ Tcl_SetVar(cltclinterp, "argv", args, TCL_GLOBAL_ONLY);
+ Tcl_Free(args);
+- stat_free( tkargv );
++ caml_stat_free( tkargv );
+ }
+ }
+ if (Tk_Init(cltclinterp) != TCL_OK)
+@@ -164,10 +164,10 @@ CAMLprim value camltk_opentk(value argv)
+ strcat(f, RCNAME);
+ if (0 == access(f,R_OK))
+ if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
+- stat_free(f);
++ caml_stat_free(f);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(f);
++ caml_stat_free(f);
+ }
+ }
+
+Index: labltk-8.06.2/support/cltkMisc.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkMisc.c
++++ labltk-8.06.2/support/cltkMisc.c
+@@ -41,12 +41,12 @@ CAMLprim value camltk_splitlist (value v
+ { value res = copy_string_list(argc,argv);
+ Tcl_Free((char *)argv); /* only one large block was allocated */
+ /* argv points into utf: utf must be freed after argv are freed */
+- stat_free( utf );
++ caml_stat_free( utf );
+ return res;
+ }
+ case TCL_ERROR:
+ default:
+- stat_free( utf );
++ caml_stat_free( utf );
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ }
+ }
+@@ -54,7 +54,7 @@ CAMLprim value camltk_splitlist (value v
+ /* Copy an OCaml string to the C heap. Should deallocate with stat_free */
+ char *string_to_c(value s)
+ {
+- int l = string_length(s);
++ int l = caml_string_length(s);
+ char *res = caml_stat_alloc(l + 1);
+ memmove (res, String_val (s), l);
+ res[l] = '\0';
+Index: labltk-8.06.2/support/cltkTimer.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkTimer.c
++++ labltk-8.06.2/support/cltkTimer.c
+@@ -26,7 +26,7 @@
+ /* Basically the same thing as FileProc */
+ void TimerProc (ClientData clientdata)
+ {
+- callback2(*handler_code,Val_long(clientdata),Val_int(0));
++ caml_callback2(*handler_code,Val_long(clientdata),Val_int(0));
+ }
+
+ CAMLprim value camltk_add_timer(value milli, value cbid)
+Index: labltk-8.06.2/support/cltkUtf.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkUtf.c
++++ labltk-8.06.2/support/cltkUtf.c
+@@ -76,14 +76,14 @@ value tcl_string_to_caml( const char *s
+ char *str;
+
+ str = utf_to_external( s );
+- res = copy_string(str);
+- stat_free(str);
++ res = caml_copy_string(str);
++ caml_stat_free(str);
+ CAMLreturn(res);
+ }
+
+ #else
+
+ char *caml_string_to_tcl(value s){ return string_to_c(s); }
+-value tcl_string_to_caml(char *s){ return copy_string(s); }
++value tcl_string_to_caml(char *s){ return caml_copy_string(s); }
+
+ #endif
+Index: labltk-8.06.2/support/cltkVar.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkVar.c
++++ labltk-8.06.2/support/cltkVar.c
+@@ -35,7 +35,7 @@ CAMLprim value camltk_getvar(value var)
+ stable_var = string_to_c(var);
+ s = (char *)Tcl_GetVar(cltclinterp,stable_var,
+ TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+- stat_free(stable_var);
++ caml_stat_free(stable_var);
+
+ if (s == NULL)
+ tk_error(Tcl_GetStringResult(cltclinterp));
+@@ -57,11 +57,11 @@ CAMLprim value camltk_setvar(value var,
+ utf_contents = caml_string_to_tcl(contents);
+ s = (char *)Tcl_SetVar(cltclinterp,stable_var, utf_contents,
+ TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+- stat_free(stable_var);
++ caml_stat_free(stable_var);
+ if( s == utf_contents ){
+ tk_error("camltk_setvar: Tcl_SetVar returned strange result. Call the author of mlTk!");
+ }
+- stat_free(utf_contents);
++ caml_stat_free(utf_contents);
+
+ if (s == NULL)
+ tk_error(Tcl_GetStringResult(cltclinterp));
+@@ -84,7 +84,7 @@ static char * tracevar(clientdata, inter
+ Tcl_UntraceVar2(interp, name1, name2,
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ tracevar, clientdata);
+- callback2(*handler_code,Val_int(clientdata),Val_unit);
++ caml_callback2(*handler_code,Val_int(clientdata),Val_unit);
+ return (char *)NULL;
+ }
+
+@@ -103,10 +103,10 @@ CAMLprim value camltk_trace_var(value va
+ tracevar,
+ (ClientData) (Long_val(cbid)))
+ != TCL_OK) {
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ return Val_unit;
+ }
+
+@@ -123,6 +123,6 @@ CAMLprim value camltk_untrace_var(value
+ TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+ tracevar,
+ (ClientData) (Long_val(cbid)));
+- stat_free(cvar);
++ caml_stat_free(cvar);
+ return Val_unit;
+ }
+Index: labltk-8.06.2/support/cltkWait.c
+===================================================================
+--- labltk-8.06.2.orig/support/cltkWait.c
++++ labltk-8.06.2/support/cltkWait.c
+@@ -54,8 +54,8 @@ static void WaitVisibilityProc(clientDat
+ Tk_DeleteEventHandler(vis->win, VisibilityChangeMask,
+ WaitVisibilityProc, clientData);
+
+- stat_free((char *)vis);
+- callback2(*handler_code,cbid,Val_int(0));
++ caml_stat_free((char *)vis);
++ caml_callback2(*handler_code,cbid,Val_int(0));
+ }
+
+ /* Sets up a callback upon Visibility of a window */
+@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win
+ (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
+ vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
+ if (vis -> win == NULL) {
+- stat_free((char *)vis);
++ caml_stat_free((char *)vis);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+ vis->cbid = Int_val(cbid);
+@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl
+ if (eventPtr->type == DestroyNotify) {
+ struct WinCBData *vis = clientData;
+ value cbid = Val_int(vis->cbid);
+- stat_free((char *)clientData);
++ caml_stat_free((char *)clientData);
+ /* The handler is destroyed by Tk itself */
+- callback2(*handler_code,cbid,Val_int(0));
++ caml_callback2(*handler_code,cbid,Val_int(0));
+ }
+ }
+
+@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win
+ (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
+ vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
+ if (vis -> win == NULL) {
+- stat_free((char *)vis);
++ caml_stat_free((char *)vis);
+ tk_error(Tcl_GetStringResult(cltclinterp));
+ };
+ vis->cbid = Int_val(cbid);
+Index: labltk-8.06.2/browser/searchpos.ml
+===================================================================
+--- labltk-8.06.2.orig/browser/searchpos.ml
++++ labltk-8.06.2/browser/searchpos.ml
+@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp =
+ search_pos_expr exp' ~pos
+ end;
+ search_pos_expr exp ~pos
+- | Texp_function (_, l, _) ->
++ | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } ->
+ List.iter l ~f:(search_case ~pos)
+ | Texp_apply (exp, l) ->
+ List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x);
+Index: labltk-8.06.2/jpf/fileselect.ml
+===================================================================
+--- labltk-8.06.2.orig/jpf/fileselect.ml
++++ labltk-8.06.2/jpf/fileselect.ml
+@@ -55,7 +55,7 @@ let myentry_create p ~variable =
+ let subshell cmd =
+ let r,w = pipe () in
+ match fork () with
+- 0 -> close r; dup2 ~src:w ~dst:stdout;
++ 0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout;
+ execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |]
+ | id ->
+ close w;
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
index 4426081ac9e..1210261ebf2 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}/findlib.patch"
+ has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/
@ 2021-03-16 19:23 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-03-16 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 2e2463e05edfeacc55bcb94bbdf81dd16cbd8fbd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 18:47:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 19:22:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2463e0
dev-ml/labltk: drop 8.06.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/labltk/Manifest | 1 -
dev-ml/labltk/files/ocaml405.patch | 382 -------------------------------------
dev-ml/labltk/labltk-8.06.2.ebuild | 44 -----
3 files changed, 427 deletions(-)
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index da891e7c3cf..57ec7056667 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,3 +1,2 @@
-DIST labltk-8.06.2.tar.gz 369508 BLAKE2B df0a5fb1cf352c52bf3177e83be2cadde961c2a7ba0496f45dc515141931d13715b4c253f74e5f280f9a6c310488236e6bc598c0ceffc408028ef5f524f2bcf2 SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6
DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
diff --git a/dev-ml/labltk/files/ocaml405.patch b/dev-ml/labltk/files/ocaml405.patch
deleted file mode 100644
index 8503646f71e..00000000000
--- a/dev-ml/labltk/files/ocaml405.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-Index: labltk-8.06.2/support/cltkCaml.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkCaml.c
-+++ labltk-8.06.2/support/cltkCaml.c
-@@ -39,7 +39,7 @@ int CamlCBCmd(ClientData clientdata, Tcl
- int id;
- if (Tcl_GetInt(interp, argv[1], &id) != TCL_OK)
- return TCL_ERROR;
-- callback2(*handler_code,Val_int(id),
-+ caml_callback2(*handler_code,Val_int(id),
- copy_string_list(argc - 2,(char **)&argv[2]));
- /* Never fails (OCaml would have raised an exception) */
- /* but result may have been set by callback */
-@@ -65,7 +65,7 @@ CAMLprim value camltk_return (value v)
- /* Note: raise_with_string WILL copy the error message */
- CAMLprim void tk_error(const char *errmsg)
- {
-- raise_with_string(*tkerror_exn, errmsg);
-+ caml_raise_with_string(*tkerror_exn, errmsg);
- }
-
-
-Index: labltk-8.06.2/support/cltkDMain.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkDMain.c
-+++ labltk-8.06.2/support/cltkDMain.c
-@@ -56,7 +56,7 @@ void invoke_pending_caml_signals (client
- /* Rearm timer */
- Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
- signal_events = 1;
-- leave_blocking_section();
-+ caml_leave_blocking_section();
- }
- /* The following is taken from byterun/startup.c */
- header_t atom_table[256];
-@@ -222,10 +222,10 @@ int Caml_Init(interp)
- strcat(f, RCNAME);
- if (0 == access(f,R_OK))
- if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
-- stat_free(f);
-+ caml_stat_free(f);
- tk_error(Tcl_GetStringResult(cltclinterp));
- };
-- stat_free(f);
-+ caml_stat_free(f);
- }
- }
-
-Index: labltk-8.06.2/support/cltkEval.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkEval.c
-+++ labltk-8.06.2/support/cltkEval.c
-@@ -45,7 +45,7 @@ value copy_string_list(int argc, char **
- for (i = argc-1; i >= 0; i--) {
- oldres = res;
- str = tcl_string_to_caml(argv[i]);
-- res = alloc(2, 0);
-+ res = caml_alloc(2, 0);
- Field(res, 0) = str;
- Field(res, 1) = oldres;
- }
-@@ -71,7 +71,7 @@ CAMLprim value camltk_tcl_eval(value str
- Tcl_ResetResult(cltclinterp);
- cmd = caml_string_to_tcl(str);
- code = Tcl_Eval(cltclinterp, cmd);
-- stat_free(cmd);
-+ caml_stat_free(cmd);
-
- switch (code) {
- case TCL_OK:
-@@ -143,8 +143,8 @@ int fill_args (char **argv, int where, v
- fill_args(tmpargv,0,Field(v,0));
- tmpargv[size] = NULL;
- merged = Tcl_Merge(size,(const char *const*)tmpargv);
-- for(i = 0; i<size; i++){ stat_free(tmpargv[i]); }
-- stat_free((char *)tmpargv);
-+ for(i = 0; i<size; i++){ caml_stat_free(tmpargv[i]); }
-+ caml_stat_free((char *)tmpargv);
- /* must be freed by stat_free */
- argv[where] = (char*)caml_stat_alloc(strlen(merged)+1);
- strcpy(argv[where], merged);
-@@ -227,10 +227,10 @@ CAMLprim value camltk_tcl_direct_eval(va
-
- /* Free the various things we allocated */
- for(i=0; i< size; i ++){
-- stat_free((char *) allocated[i]);
-+ caml_stat_free((char *) allocated[i]);
- }
-- stat_free((char *)argv);
-- stat_free((char *)allocated);
-+ caml_stat_free((char *)argv);
-+ caml_stat_free((char *)allocated);
-
- switch (result) {
- case TCL_OK:
-Index: labltk-8.06.2/support/cltkEvent.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkEvent.c
-+++ labltk-8.06.2/support/cltkEvent.c
-@@ -49,6 +49,6 @@ CAMLprim value camltk_dooneevent(value f
-
- CheckInit();
-
-- ret = Tk_DoOneEvent(convert_flag_list(flags, event_flag_table));
-+ ret = Tk_DoOneEvent(caml_convert_flag_list(flags, event_flag_table));
- return Val_int(ret);
- }
-Index: labltk-8.06.2/support/cltkFile.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkFile.c
-+++ labltk-8.06.2/support/cltkFile.c
-@@ -33,7 +33,7 @@
-
- void FileProc(ClientData clientdata, int mask)
- {
-- callback2(*handler_code,Val_int(clientdata),Val_int(0));
-+ caml_callback2(*handler_code,Val_int(clientdata),Val_int(0));
- }
-
- /* Map Unix.file_descr values to Tcl file handles */
-Index: labltk-8.06.2/support/cltkImg.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkImg.c
-+++ labltk-8.06.2/support/cltkImg.c
-@@ -47,7 +47,7 @@ CAMLprim value camltk_getimgdata (value
-
- code = Tk_PhotoGetImage(ph,&pib); /* never fails ? */
- size = pib.width * pib.height * pib.pixelSize;
-- res = alloc_string(size);
-+ res = caml_alloc_string(size);
-
- /* no holes, default format ? */
- if ((pib.pixelSize == 3) &&
-Index: labltk-8.06.2/support/cltkMain.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkMain.c
-+++ labltk-8.06.2/support/cltkMain.c
-@@ -51,11 +51,11 @@ int signal_events = 0; /* do we have a p
- void invoke_pending_caml_signals (ClientData clientdata)
- {
- signal_events = 0;
-- enter_blocking_section(); /* triggers signal handling */
-+ caml_enter_blocking_section(); /* triggers signal handling */
- /* Rearm timer */
- Tk_CreateTimerHandler(SIGNAL_INTERVAL, invoke_pending_caml_signals, NULL);
- signal_events = 1;
-- leave_blocking_section();
-+ caml_leave_blocking_section();
- }
-
- /* Now the real Tk stuff */
-@@ -77,7 +77,7 @@ CAMLprim value camltk_opentk(value argv)
- tmp = Val_unit;
-
- if ( argv == Val_int(0) ){
-- failwith("camltk_opentk: argv is empty");
-+ caml_failwith("camltk_opentk: argv is empty");
- }
- argv0 = String_val( Field( argv, 0 ) );
-
-@@ -91,7 +91,7 @@ CAMLprim value camltk_opentk(value argv)
- /* Register cltclinterp for use in other related extensions */
- value *interp = caml_named_value("cltclinterp");
- if (interp != NULL)
-- Store_field(*interp,0,copy_nativeint((intnat)cltclinterp));
-+ Store_field(*interp,0,caml_copy_nativeint((intnat)cltclinterp));
- }
-
- if (Tcl_Init(cltclinterp) != TCL_OK)
-@@ -128,7 +128,7 @@ CAMLprim value camltk_opentk(value argv)
- args = Tcl_Merge(argc, (const char *const*)tkargv); /* args must be freed by Tcl_Free */
- Tcl_SetVar(cltclinterp, "argv", args, TCL_GLOBAL_ONLY);
- Tcl_Free(args);
-- stat_free( tkargv );
-+ caml_stat_free( tkargv );
- }
- }
- if (Tk_Init(cltclinterp) != TCL_OK)
-@@ -164,10 +164,10 @@ CAMLprim value camltk_opentk(value argv)
- strcat(f, RCNAME);
- if (0 == access(f,R_OK))
- if (TCL_OK != Tcl_EvalFile(cltclinterp,f)) {
-- stat_free(f);
-+ caml_stat_free(f);
- tk_error(Tcl_GetStringResult(cltclinterp));
- };
-- stat_free(f);
-+ caml_stat_free(f);
- }
- }
-
-Index: labltk-8.06.2/support/cltkMisc.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkMisc.c
-+++ labltk-8.06.2/support/cltkMisc.c
-@@ -41,12 +41,12 @@ CAMLprim value camltk_splitlist (value v
- { value res = copy_string_list(argc,argv);
- Tcl_Free((char *)argv); /* only one large block was allocated */
- /* argv points into utf: utf must be freed after argv are freed */
-- stat_free( utf );
-+ caml_stat_free( utf );
- return res;
- }
- case TCL_ERROR:
- default:
-- stat_free( utf );
-+ caml_stat_free( utf );
- tk_error(Tcl_GetStringResult(cltclinterp));
- }
- }
-@@ -54,7 +54,7 @@ CAMLprim value camltk_splitlist (value v
- /* Copy an OCaml string to the C heap. Should deallocate with stat_free */
- char *string_to_c(value s)
- {
-- int l = string_length(s);
-+ int l = caml_string_length(s);
- char *res = caml_stat_alloc(l + 1);
- memmove (res, String_val (s), l);
- res[l] = '\0';
-Index: labltk-8.06.2/support/cltkTimer.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkTimer.c
-+++ labltk-8.06.2/support/cltkTimer.c
-@@ -26,7 +26,7 @@
- /* Basically the same thing as FileProc */
- void TimerProc (ClientData clientdata)
- {
-- callback2(*handler_code,Val_long(clientdata),Val_int(0));
-+ caml_callback2(*handler_code,Val_long(clientdata),Val_int(0));
- }
-
- CAMLprim value camltk_add_timer(value milli, value cbid)
-Index: labltk-8.06.2/support/cltkUtf.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkUtf.c
-+++ labltk-8.06.2/support/cltkUtf.c
-@@ -76,14 +76,14 @@ value tcl_string_to_caml( const char *s
- char *str;
-
- str = utf_to_external( s );
-- res = copy_string(str);
-- stat_free(str);
-+ res = caml_copy_string(str);
-+ caml_stat_free(str);
- CAMLreturn(res);
- }
-
- #else
-
- char *caml_string_to_tcl(value s){ return string_to_c(s); }
--value tcl_string_to_caml(char *s){ return copy_string(s); }
-+value tcl_string_to_caml(char *s){ return caml_copy_string(s); }
-
- #endif
-Index: labltk-8.06.2/support/cltkVar.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkVar.c
-+++ labltk-8.06.2/support/cltkVar.c
-@@ -35,7 +35,7 @@ CAMLprim value camltk_getvar(value var)
- stable_var = string_to_c(var);
- s = (char *)Tcl_GetVar(cltclinterp,stable_var,
- TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
-- stat_free(stable_var);
-+ caml_stat_free(stable_var);
-
- if (s == NULL)
- tk_error(Tcl_GetStringResult(cltclinterp));
-@@ -57,11 +57,11 @@ CAMLprim value camltk_setvar(value var,
- utf_contents = caml_string_to_tcl(contents);
- s = (char *)Tcl_SetVar(cltclinterp,stable_var, utf_contents,
- TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
-- stat_free(stable_var);
-+ caml_stat_free(stable_var);
- if( s == utf_contents ){
- tk_error("camltk_setvar: Tcl_SetVar returned strange result. Call the author of mlTk!");
- }
-- stat_free(utf_contents);
-+ caml_stat_free(utf_contents);
-
- if (s == NULL)
- tk_error(Tcl_GetStringResult(cltclinterp));
-@@ -84,7 +84,7 @@ static char * tracevar(clientdata, inter
- Tcl_UntraceVar2(interp, name1, name2,
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
- tracevar, clientdata);
-- callback2(*handler_code,Val_int(clientdata),Val_unit);
-+ caml_callback2(*handler_code,Val_int(clientdata),Val_unit);
- return (char *)NULL;
- }
-
-@@ -103,10 +103,10 @@ CAMLprim value camltk_trace_var(value va
- tracevar,
- (ClientData) (Long_val(cbid)))
- != TCL_OK) {
-- stat_free(cvar);
-+ caml_stat_free(cvar);
- tk_error(Tcl_GetStringResult(cltclinterp));
- };
-- stat_free(cvar);
-+ caml_stat_free(cvar);
- return Val_unit;
- }
-
-@@ -123,6 +123,6 @@ CAMLprim value camltk_untrace_var(value
- TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
- tracevar,
- (ClientData) (Long_val(cbid)));
-- stat_free(cvar);
-+ caml_stat_free(cvar);
- return Val_unit;
- }
-Index: labltk-8.06.2/support/cltkWait.c
-===================================================================
---- labltk-8.06.2.orig/support/cltkWait.c
-+++ labltk-8.06.2/support/cltkWait.c
-@@ -54,8 +54,8 @@ static void WaitVisibilityProc(clientDat
- Tk_DeleteEventHandler(vis->win, VisibilityChangeMask,
- WaitVisibilityProc, clientData);
-
-- stat_free((char *)vis);
-- callback2(*handler_code,cbid,Val_int(0));
-+ caml_stat_free((char *)vis);
-+ caml_callback2(*handler_code,cbid,Val_int(0));
- }
-
- /* Sets up a callback upon Visibility of a window */
-@@ -65,7 +65,7 @@ CAMLprim value camltk_wait_vis(value win
- (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
- vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
- if (vis -> win == NULL) {
-- stat_free((char *)vis);
-+ caml_stat_free((char *)vis);
- tk_error(Tcl_GetStringResult(cltclinterp));
- };
- vis->cbid = Int_val(cbid);
-@@ -79,9 +79,9 @@ static void WaitWindowProc(ClientData cl
- if (eventPtr->type == DestroyNotify) {
- struct WinCBData *vis = clientData;
- value cbid = Val_int(vis->cbid);
-- stat_free((char *)clientData);
-+ caml_stat_free((char *)clientData);
- /* The handler is destroyed by Tk itself */
-- callback2(*handler_code,cbid,Val_int(0));
-+ caml_callback2(*handler_code,cbid,Val_int(0));
- }
- }
-
-@@ -92,7 +92,7 @@ CAMLprim value camltk_wait_des(value win
- (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData));
- vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow);
- if (vis -> win == NULL) {
-- stat_free((char *)vis);
-+ caml_stat_free((char *)vis);
- tk_error(Tcl_GetStringResult(cltclinterp));
- };
- vis->cbid = Int_val(cbid);
-Index: labltk-8.06.2/browser/searchpos.ml
-===================================================================
---- labltk-8.06.2.orig/browser/searchpos.ml
-+++ labltk-8.06.2/browser/searchpos.ml
-@@ -782,7 +782,7 @@ and search_pos_expr ~pos exp =
- search_pos_expr exp' ~pos
- end;
- search_pos_expr exp ~pos
-- | Texp_function (_, l, _) ->
-+ | Texp_function { arg_label = _; param = _ ; cases = l; partial = _; } ->
- List.iter l ~f:(search_case ~pos)
- | Texp_apply (exp, l) ->
- List.iter l ~f:(fun (_, x) -> Misc.may (search_pos_expr ~pos) x);
-Index: labltk-8.06.2/jpf/fileselect.ml
-===================================================================
---- labltk-8.06.2.orig/jpf/fileselect.ml
-+++ labltk-8.06.2/jpf/fileselect.ml
-@@ -55,7 +55,7 @@ let myentry_create p ~variable =
- let subshell cmd =
- let r,w = pipe () in
- match fork () with
-- 0 -> close r; dup2 ~src:w ~dst:stdout;
-+ 0 -> close r; dup2 ~cloexec:false ~src:w ~dst:stdout;
- execv ~prog:"/bin/sh" ~args:[| "/bin/sh"; "-c"; cmd |]
- | id ->
- close w;
diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild b/dev-ml/labltk/labltk-8.06.2.ebuild
deleted file mode 100644
index c598fa16790..00000000000
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
-HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1628/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt X"
-
-RDEPEND=">=dev-lang/tk-8.0.3:=
- >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
-DEPEND="${RDEPEND}
- >=dev-ml/findlib-1.5.5-r1"
-
-src_prepare() {
- epatch "${FILESDIR}/findlib.patch"
- has_version '>=dev-lang/ocaml-4.05.0_beta' && epatch "${FILESDIR}/ocaml405.patch"
-}
-
-src_configure() {
- ./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
-}
-
-src_compile() {
- emake -j1
- use ocamlopt && emake -j1 opt
-}
-
-src_install() {
- findlib_src_preinst
- dodir /usr/bin
- emake \
- INSTALLDIR="${D}$(ocamlc -where)/labltk" \
- INSTALLBINDIR="${ED}/usr/bin/" \
- install
- dodoc Changes README.mlTk
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/
@ 2021-07-14 20:53 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-07-14 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 121fe1ef2a7536970641a63ae26ca8c42dddbdd5
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 20:53:26 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:53:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121fe1ef
dev-ml/labltk: fix build until dev-lang/ocaml:4.12
Closes: https://bugs.gentoo.org/795246
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../files/labltk-8.06.10-this-expression-has-type.patch | 12 ++++++++++++
dev-ml/labltk/labltk-8.06.10.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
new file mode 100644
index 00000000000..8f9fde6bdd7
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.10-this-expression-has-type.patch
@@ -0,0 +1,12 @@
+diff -urNp labltk-8.06.10-orig/browser/typecheck.ml labltk-8.06.10-dwok/browser/typecheck.ml
+--- labltk-8.06.10-orig/browser/typecheck.ml 2020-08-25 07:50:47.000000000 +0200
++++ labltk-8.06.10-dwok/browser/typecheck.ml 2021-02-26 01:55:00.000000000 +0100
+@@ -116,7 +116,7 @@ let f txt =
+ List.iter psl ~f:
+ begin function
+ Ptop_def pstr ->
+- let str, sign, _names, env' = Typemod.type_structure !env pstr in
++ let str, sign, _names, env' = Typemod.type_structure !env pstr Location.none in
+ txt.structure <- txt.structure @ str.str_items;
+ txt.signature <- txt.signature @ sign;
+ env := env'
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10.ebuild
index 10d78bc548a..6acd06b500f 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${P}-this-expression-has-type.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/
@ 2022-11-19 1:35 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-11-19 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 6607bc47bc8b5a12283fe21c539cc9687adf2741
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 01:20:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 01:34:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6607bc47
dev-ml/labltk: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/881841
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/labltk/files/labltk-8.06.7-configure.patch | 27 ++++++++++++
.../files/labltk-8.06.9-configure-clang16.patch | 50 ++++++++++++++++++++++
...ltk-8.06.10.ebuild => labltk-8.06.10-r1.ebuild} | 1 +
...ltk-8.06.11.ebuild => labltk-8.06.11-r1.ebuild} | 1 +
...ltk-8.06.12.ebuild => labltk-8.06.12-r1.ebuild} | 1 +
...abltk-8.06.7.ebuild => labltk-8.06.7-r1.ebuild} | 2 +
...abltk-8.06.9.ebuild => labltk-8.06.9-r1.ebuild} | 1 +
7 files changed, 83 insertions(+)
diff --git a/dev-ml/labltk/files/labltk-8.06.7-configure.patch b/dev-ml/labltk/files/labltk-8.06.7-configure.patch
new file mode 100644
index 000000000000..320f92f7ce45
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.7-configure.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/881841
+https://github.com/garrigue/labltk/commit/be8c977d320ed40cacb322658d4ceba5e583b3a6
+
+From be8c977d320ed40cacb322658d4ceba5e583b3a6 Mon Sep 17 00:00:00 2001
+From: Jacques Garrigue <garrigue@math.nagoya-u.ac.jp>
+Date: Mon, 24 Aug 2020 11:27:34 +0900
+Subject: [PATCH] Fix config/auto-aux/hasgot for clang 12
+
+--- a/config/auto-aux/hasgot
++++ b/config/auto-aux/hasgot
+@@ -30,7 +30,8 @@ while : ; do
+ shift
+ done
+
+-(echo "main() {"
++(for f in $*; do echo "int $f();"; done
++ echo "int main() {"
+ for f in $*; do echo " $f();"; done
+ echo "}") >> hasgot.c
+
+--- a/config/auto-aux/hasgot.c
++++ /dev/null
+@@ -1,3 +0,0 @@
+-main() {
+- Tk_SetGrid();
+-}
+
diff --git a/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch b/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch
new file mode 100644
index 000000000000..bc7e04175f7f
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.9-configure-clang16.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/881841
+https://github.com/garrigue/labltk/pull/17
+
+From e1e850972c4190686a040574b91d61948cc559b5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 19 Nov 2022 01:14:25 +0000
+Subject: [PATCH] config: Fix -Wimplicit-int, -Wstrict-prototypes (Clang 16)
+
+Followup to be8c977d320ed40cacb322658d4ceba5e583b3a6.
+
+Clang 16 makes -Wimplicit-int error by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/config/auto-aux/hasgot
++++ b/config/auto-aux/hasgot
+@@ -31,7 +31,7 @@ while : ; do
+ done
+
+ (for f in $*; do echo "int $f();"; done
+- echo "int main() {"
++ echo "int main(void) {"
+ for f in $*; do echo " $f();"; done
+ echo "}") >> hasgot.c
+
+--- a/config/auto-aux/tclversion.c
++++ b/config/auto-aux/tclversion.c
+@@ -18,7 +18,7 @@
+ #include <tcl.h>
+ #include <tk.h>
+
+-main ()
++int main (void)
+ {
+ puts(TCL_VERSION);
+ }
+
diff --git a/dev-ml/labltk/labltk-8.06.10.ebuild b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
similarity index 96%
rename from dev-ml/labltk/labltk-8.06.10.ebuild
rename to dev-ml/labltk/labltk-8.06.10-r1.ebuild
index 0e2d1e982325..ba2aeaa5b347 100644
--- a/dev-ml/labltk/labltk-8.06.10.ebuild
+++ b/dev-ml/labltk/labltk-8.06.10-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
"${WORKDIR}"/${P}-warnings.patch
)
diff --git a/dev-ml/labltk/labltk-8.06.11.ebuild b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
similarity index 95%
rename from dev-ml/labltk/labltk-8.06.11.ebuild
rename to dev-ml/labltk/labltk-8.06.11-r1.ebuild
index 150ac43273e3..d3936002790d 100644
--- a/dev-ml/labltk/labltk-8.06.11.ebuild
+++ b/dev-ml/labltk/labltk-8.06.11-r1.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
)
src_prepare() {
diff --git a/dev-ml/labltk/labltk-8.06.12.ebuild b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
similarity index 95%
rename from dev-ml/labltk/labltk-8.06.12.ebuild
rename to dev-ml/labltk/labltk-8.06.12-r1.ebuild
index 3042cc64e298..fe10ce5dc4e6 100644
--- a/dev-ml/labltk/labltk-8.06.12.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r1.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
)
src_prepare() {
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
similarity index 92%
rename from dev-ml/labltk/labltk-8.06.7.ebuild
rename to dev-ml/labltk/labltk-8.06.7-r1.ebuild
index 637bdd00956e..4acab0317733 100644
--- a/dev-ml/labltk/labltk-8.06.7.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7-r1.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
)
src_prepare() {
diff --git a/dev-ml/labltk/labltk-8.06.9.ebuild b/dev-ml/labltk/labltk-8.06.9-r1.ebuild
similarity index 95%
rename from dev-ml/labltk/labltk-8.06.9.ebuild
rename to dev-ml/labltk/labltk-8.06.9-r1.ebuild
index 7bce5317f51d..aad779f428a8 100644
--- a/dev-ml/labltk/labltk-8.06.9.ebuild
+++ b/dev-ml/labltk/labltk-8.06.9-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/findlib.patch"
+ "${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/
@ 2024-06-04 18:25 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2024-06-04 18:25 UTC (permalink / raw
To: gentoo-commits
commit: c2d33a9ed87b79678ce90a6f2d5e29d87b6474b2
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 18:24:21 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 18:25:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d33a9e
dev-ml/labltk: fix -Wincompatible-pointer-types
Closes: https://bugs.gentoo.org/919294
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ml/labltk/files/labltk-8.06.12-c99.patch | 11 +++++++++++
dev-ml/labltk/labltk-8.06.12-r2.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev-ml/labltk/files/labltk-8.06.12-c99.patch b/dev-ml/labltk/files/labltk-8.06.12-c99.patch
new file mode 100644
index 000000000000..1761f478bd76
--- /dev/null
+++ b/dev-ml/labltk/files/labltk-8.06.12-c99.patch
@@ -0,0 +1,11 @@
+--- a/support/cltkVar.c 2024-06-04 20:18:35.940518270 +0200
++++ b/support/cltkVar.c 2024-06-04 20:18:49.456367424 +0200
+@@ -75,7 +75,7 @@
+ Tcl_Interp *interp, char *part1, char *part2, int flags));
+ */
+ static char * tracevar(ClientData clientdata, Tcl_Interp *interp,
+- char *name1, char *name2, int flags)
++ const char *name1, const char *name2, int flags)
+ /* interp -> Interpreter containing variable. */
+ /* name1 -> Name of variable. */
+ /* name2 -> Second part of variable name. */
diff --git a/dev-ml/labltk/labltk-8.06.12-r2.ebuild b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
index 8842a41bed31..974b1280538d 100644
--- a/dev-ml/labltk/labltk-8.06.12-r2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.06.9-configure-clang16.patch
"${FILESDIR}"/${P}-shuffle.patch
"${FILESDIR}"/${P}-c2x.patch
+ "${FILESDIR}"/${P}-c99.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-04 18:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-03 12:12 [gentoo-commits] repo/gentoo:master commit in: dev-ml/labltk/, dev-ml/labltk/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2021-03-16 19:23 Sam James
2021-07-14 20:53 Alfredo Tupone
2022-11-19 1:35 Sam James
2024-06-04 18:25 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox