Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-lablgtk3 for openSUSE:Factory checked in at 2023-01-05 15:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-lablgtk3 (Old) and /work/SRC/openSUSE:Factory/.ocaml-lablgtk3.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-lablgtk3" Thu Jan 5 15:00:54 2023 rev:5 rq:1056074 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-lablgtk3/ocaml-lablgtk3.changes 2022-04-06 21:52:18.619006461 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-lablgtk3.new.1563/ocaml-lablgtk3.changes 2023-01-05 15:01:14.045140845 +0100 @@ -1,0 +2,6 @@ +Sun Jan 1 01:01:01 UTC 2023 - oher...@suse.de + +- Update to version 3.1.3 + prepare for ocaml-5.0 + +------------------------------------------------------------------- Old: ---- ocaml-lablgtk3-3.1.2.tar.xz New: ---- ocaml-lablgtk3-3.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgtk3.spec ++++++ --- /var/tmp/diff_new_pack.OZUR9O/_old 2023-01-05 15:01:14.617143861 +0100 +++ /var/tmp/diff_new_pack.OZUR9O/_new 2023-01-05 15:01:14.637143966 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-lablgtk3 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ocaml-lablgtk3 -Version: 3.1.2 +Version: 3.1.3 Release: 0 Summary: Binding to Cairo, a 2D Vector Graphics Library. License: LGPL-3.0-or-later @@ -25,10 +25,11 @@ URL: https://opam.ocaml.org/packages/lablgtk3 Source: %name-%version.tar.xz BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20220222 +BuildRequires: ocaml-rpm-macros >= 20230101 BuildRequires: pkg-config -BuildRequires: ocaml(ocaml_base_version) >= 4.05 +BuildRequires: ocaml(ocaml_base_version) >= 4.09 BuildRequires: ocamlfind(cairo2) +BuildRequires: ocamlfind(camlp-streams) BuildRequires: ocamlfind(camlp5) BuildRequires: ocamlfind(dune.configurator) BuildRequires: ocamlfind(findlib) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OZUR9O/_old 2023-01-05 15:01:14.693144261 +0100 +++ /var/tmp/diff_new_pack.OZUR9O/_new 2023-01-05 15:01:14.697144282 +0100 @@ -15,7 +15,7 @@ <param name="exclude">tools/propcc.ml</param> <param name="exclude">tools/varcc.ml</param> <param name="filename">ocaml-lablgtk3</param> - <param name="revision">b4e316e0f9ee47b33734c2e4e3f56a3867acd038</param> + <param name="revision">8a803575ded8107a063a8779c47ca79310de90bc</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/garrigue/lablgtk.git</param> ++++++ ocaml-lablgtk3-3.1.2.tar.xz -> ocaml-lablgtk3-3.1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/CHANGES.md new/ocaml-lablgtk3-3.1.3/CHANGES.md --- old/ocaml-lablgtk3-3.1.2/CHANGES.md 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/CHANGES.md 2022-10-06 09:24:16.000000000 +0200 @@ -1,5 +1,10 @@ LablGTK changes log +## In Lablgtk-3.1.3 + +2022.10.06 [Jacques] + * Adapt to deprecations in 5.0 and the splitting of camlp-streams + ## In Lablgtk-3.1.2 2021.12.24[Jacques] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/README.md new/ocaml-lablgtk3-3.1.3/README.md --- old/ocaml-lablgtk3-3.1.2/README.md 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/README.md 2022-10-06 09:24:16.000000000 +0200 @@ -1,8 +1,8 @@ -# LablGTK3 3.1.2 : an interface to the GIMP Tool Kit +# LablGTK3 3.1.3 : an interface to the GIMP Tool Kit ## Dependencies -- ocaml >= 4.05.0 +- ocaml >= 4.05.0 (including 5.0) - gtk+ >= 3.18 - dune >= 1.8 - camlp5 (for developer build only) @@ -314,7 +314,7 @@ Since Darwin is Unix, this port compiles as usual. Note however that Quartz imposes even stronger restrictions than Windows on threads: only the main thread of the application can do GUI -work. Just apply the same techniques as described in the Windos port, +work. Just apply the same techniques as described in the Windows port, being careful to ensure that your first call to `GtkThread.main` occurs in the main thread. This can be done by issueing the following commands diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/dune-project new/ocaml-lablgtk3-3.1.3/dune-project --- old/ocaml-lablgtk3-3.1.2/dune-project 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/dune-project 2022-10-06 09:24:16.000000000 +0200 @@ -1,2 +1,3 @@ (lang dune 1.8) (name lablgtk3) +(version 3.1.2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/lablgtk3-goocanvas2.opam new/ocaml-lablgtk3-3.1.3/lablgtk3-goocanvas2.opam --- old/ocaml-lablgtk3-3.1.2/lablgtk3-goocanvas2.opam 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/lablgtk3-goocanvas2.opam 2022-10-06 09:24:16.000000000 +0200 @@ -12,14 +12,15 @@ homepage: "https://github.com/garrigue/lablgtk"; bug-reports: "https://github.com/garrigue/lablgtk/issues"; dev-repo: "git+https://github.com/garrigue/lablgtk.git"; -doc: "https://garrigue.github.io/lablgtk/lablgtk3-sourceview3"; +doc: "https://garrigue.github.io/lablgtk/lablgtk3/lablgtk3-goocanvas2"; license: "LGPL with linking exception" depends: [ - "ocaml" { >= "4.05.0" } + "ocaml" { >= "4.09.0" } "dune" { >= "1.8.0" } "lablgtk3" { = version } "conf-goocanvas2" { build & >= "0" } + "camlp-streams" { build } ] build: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/lablgtk3-gtkspell3.opam new/ocaml-lablgtk3-3.1.3/lablgtk3-gtkspell3.opam --- old/ocaml-lablgtk3-3.1.2/lablgtk3-gtkspell3.opam 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/lablgtk3-gtkspell3.opam 2022-10-06 09:24:16.000000000 +0200 @@ -13,11 +13,11 @@ homepage: "https://github.com/garrigue/lablgtk"; bug-reports: "https://github.com/garrigue/lablgtk/issues"; dev-repo: "git+https://github.com/garrigue/lablgtk.git"; -doc: "https://garrigue.github.io/lablgtk/lablgtk3-gtkspell3"; +doc: "https://garrigue.github.io/lablgtk/lablgtk3/lablgtk3-gtkspell3"; license: "LGPL with linking exception" depends: [ - "ocaml" { >= "4.05.0" } + "ocaml" { >= "4.09.0" } "dune" { >= "1.8.0" } "lablgtk3" { = version } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/lablgtk3-sourceview3.opam new/ocaml-lablgtk3-3.1.3/lablgtk3-sourceview3.opam --- old/ocaml-lablgtk3-3.1.2/lablgtk3-sourceview3.opam 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/lablgtk3-sourceview3.opam 2022-10-06 09:24:16.000000000 +0200 @@ -12,14 +12,15 @@ homepage: "https://github.com/garrigue/lablgtk"; bug-reports: "https://github.com/garrigue/lablgtk/issues"; dev-repo: "git+https://github.com/garrigue/lablgtk.git"; -doc: "https://garrigue.github.io/lablgtk/lablgtk3-sourceview3"; +doc: "https://garrigue.github.io/lablgtk/lablgtk3/lablgtk3-sourceview3"; license: "LGPL with linking exception" depends: [ - "ocaml" { >= "4.05.0" } + "ocaml" { >= "4.09.0" } "dune" { >= "1.8.0" } "lablgtk3" { = version } "conf-gtksourceview3" { build & >= "0" } + "camlp-streams" { build } ] build: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/lablgtk3.opam new/ocaml-lablgtk3-3.1.3/lablgtk3.opam --- old/ocaml-lablgtk3-3.1.2/lablgtk3.opam 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/lablgtk3.opam 2022-10-06 09:24:16.000000000 +0200 @@ -13,13 +13,14 @@ bug-reports: "https://github.com/garrigue/lablgtk/issues"; dev-repo: "git+https://github.com/garrigue/lablgtk.git"; license: "LGPL with linking exception" -doc: "https://garrigue.github.io/lablgtk/lablgtk3"; +doc: "https://garrigue.github.io/lablgtk/lablgtk3/lablgtk3"; depends: [ - "ocaml" { >= "4.05.0" } + "ocaml" { >= "4.09.0" } "dune" { >= "1.8.0" } "cairo2" { >= "0.6" } "conf-gtk3" { build & >= "18" } + "camlp-streams" { build } "ocamlfind" { dev } "camlp5" { dev } ] @@ -27,3 +28,6 @@ build: [ [ "dune" "build" "-p" name "-j" jobs ] ] +run-test: [ + [ "dune" "build" "-p" name "-j" jobs "examples/buttons.exe" ] +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/cairo_pango_stubs.c new/ocaml-lablgtk3-3.1.3/src/cairo_pango_stubs.c --- old/ocaml-lablgtk3-3.1.2/src/cairo_pango_stubs.c 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/cairo_pango_stubs.c 2022-10-06 09:24:16.000000000 +0200 @@ -30,7 +30,7 @@ /* OCaml Cairo bindings */ #include "cairo_ocaml.h" -/* https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html */ +/* https://developer-old.gnome.org/pango/stable/pango-Cairo-Rendering.html */ #define ALLOC(name) alloc_custom(&caml_##name##_ops, sizeof(void*), 1, 50) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/glib.ml new/ocaml-lablgtk3-3.1.3/src/glib.ml --- old/ocaml-lablgtk3-3.1.2/src/glib.ml 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/glib.ml 2022-10-06 09:24:16.000000000 +0200 @@ -114,7 +114,7 @@ external _log : string -> int -> string -> unit = "ml_g_log" let log ?(domain="") level fmt = - Printf.kprintf (_log domain (log_level level)) fmt + Printf.kprintf (_log domain (log_level level)) fmt [@alert "-deprecated"] end (* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/ml_gdk.h new/ocaml-lablgtk3-3.1.3/src/ml_gdk.h --- old/ocaml-lablgtk3-3.1.2/src/ml_gdk.h 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/ml_gdk.h 2022-10-06 09:24:16.000000000 +0200 @@ -71,14 +71,14 @@ #define GdkNativeWindow_val Pointer_val #define Val_GdkNativeWindow Val_pointer #else -#define Val_GdkNativeWindow copy_int32 +#define Val_GdkNativeWindow caml_copy_int32 #define GdkNativeWindow_val Int32_val #endif #ifdef _WIN32 -#define Val_XID(id) copy_int32((long) id) +#define Val_XID(id) caml_copy_int32((long) id) #else -#define Val_XID copy_int32 +#define Val_XID caml_copy_int32 #endif #define XID_val Int32_val diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/ml_gdkpixbuf.c new/ocaml-lablgtk3-3.1.3/src/ml_gdkpixbuf.c --- old/ocaml-lablgtk3-3.1.2/src/ml_gdkpixbuf.c 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/ml_gdkpixbuf.c 2022-10-06 09:24:16.000000000 +0200 @@ -32,6 +32,7 @@ #include <caml/callback.h> #include <caml/fail.h> #include <caml/intext.h> +#include <caml/printexc.h> #include "wrappers.h" #include "ml_glib.h" @@ -66,8 +67,8 @@ guint len; pixels = gdk_pixdata_from_pixbuf (&pixdata, pb, pixbuf_marshal_use_rle); stream = gdk_pixdata_serialize (&pixdata, &len); - serialize_int_4 (len); - serialize_block_1 (stream, len); + caml_serialize_int_4 (len); + caml_serialize_block_1 (stream, len); g_free (stream); g_free (pixels); *wsize_32 = 4; @@ -82,9 +83,9 @@ guint8 *stream; guint len; - len = deserialize_uint_4(); + len = caml_deserialize_uint_4(); stream = stat_alloc (len); - deserialize_block_1 (stream, len); + caml_deserialize_block_1 (stream, len); gdk_pixdata_deserialize (&pixdata, len, stream, &error); if (error) goto out; pb = gdk_pixbuf_from_pixdata (&pixdata, TRUE, &error); @@ -100,7 +101,7 @@ GEnumValue *val = g_enum_get_value (class, error->code); msg = val ? (char*)val->value_name : ""; g_error_free (error); - deserialize_error (msg); + caml_deserialize_error (msg); } return sizeof pb; } @@ -308,7 +309,7 @@ if (Is_exception_result (res)) { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, - "%s", format_caml_exception(Extract_exception(res))); + "%s", caml_format_exception(Extract_exception(res))); return FALSE; } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/ml_gobject.c new/ocaml-lablgtk3-3.1.3/src/ml_gobject.c --- old/ocaml-lablgtk3-3.1.2/src/ml_gobject.c 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/ml_gobject.c 2022-10-06 09:24:16.000000000 +0200 @@ -178,7 +178,7 @@ static void notify_destroy(gpointer unit, GClosure *c) { // printf("release %p\n", &c->data); - remove_global_root((value*)&c->data); + caml_remove_global_root((value*)&c->data); } static void marshal_core (GClosure *closure, GValue *ret, @@ -215,7 +215,7 @@ { GClosure* closure = g_closure_new_simple(sizeof(GClosure), (gpointer)clos); // printf("register %p\n", &closure->data); - register_global_root((value*)&closure->data); + caml_register_global_root((value*)&closure->data); g_closure_add_invalidate_notifier(closure, NULL, notify_destroy); g_closure_set_marshal(closure, marshal); return Val_GClosure_sink(closure); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/tools/lablgladecc.ml new/ocaml-lablgtk3-3.1.3/src/tools/lablgladecc.ml --- old/ocaml-lablgtk3-3.1.2/src/tools/lablgladecc.ml 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/tools/lablgladecc.ml 2022-10-06 09:24:16.000000000 +0200 @@ -385,7 +385,7 @@ let lexbuf, data = if !embed then begin let b = Buffer.create 1024 in - let buf = String.create 1024 in + let buf = Bytes.create 1024 in while let len = input chan buf 0 1024 in Buffer.add_subbytes b buf 0 len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/wrappers.c new/ocaml-lablgtk3-3.1.3/src/wrappers.c --- old/ocaml-lablgtk3-3.1.2/src/wrappers.c 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/wrappers.c 2022-10-06 09:24:16.000000000 +0200 @@ -131,13 +131,13 @@ { value *p = stat_alloc(sizeof(value)); *p = v; - register_global_root (p); + caml_register_global_root (p); return p; } CAMLexport void ml_global_root_destroy (void *data) { - remove_global_root ((value *)data); + caml_remove_global_root ((value *)data); stat_free (data); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/src/wrappers.h new/ocaml-lablgtk3-3.1.3/src/wrappers.h --- old/ocaml-lablgtk3-3.1.2/src/wrappers.h 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/src/wrappers.h 2022-10-06 09:24:16.000000000 +0200 @@ -27,7 +27,7 @@ /* Yell if a caml callback raised an exception */ #define CAML_EXN_LOG(name) g_critical("%s: callback raised an exception", name) -#define CAML_EXN_LOG_VERBOSE(name,exn) g_critical("%s: callback raised exception %s", name, format_caml_exception(Extract_exception(exn))) +#define CAML_EXN_LOG_VERBOSE(name,exn) g_critical("%s: callback raised exception %s", name, caml_format_exception(Extract_exception(exn))) #include <caml/misc.h> #include <caml/mlvalues.h> @@ -41,6 +41,64 @@ #define Bytes_val String_val #endif +/* We are still using the compatibility layer */ +#ifdef CAML_NAME_SPACE +/* **** alloc.c */ +#define alloc caml_alloc /*SP*/ +#define alloc_small caml_alloc_small +#define alloc_tuple caml_alloc_tuple +#define alloc_string caml_alloc_string +#define alloc_final caml_alloc_final +#define copy_string caml_copy_string +#define alloc_array caml_alloc_array +#define copy_string_array caml_copy_string_array +#define convert_flag_list caml_convert_flag_list +/* **** callback.c */ +#define callback_depth caml_callback_depth +#define callbackN_exn caml_callbackN_exn +#define callback_exn caml_callback_exn +#define callback2_exn caml_callback2_exn +#define callback3_exn caml_callback3_exn +#define callback caml_callback +#define callback2 caml_callback2 +#define callback3 caml_callback3 +#define callbackN caml_callbackN +/* **** custom.c */ +#define alloc_custom caml_alloc_custom +#define register_custom_operations caml_register_custom_operations +/* **** ints.c */ +#define copy_int32 caml_copy_int32 +#define copy_int64 caml_copy_int64 +#define copy_nativeint caml_copy_nativeint +/* **** fail.c */ +#define external_raise caml_external_raise +#define mlraise caml_raise /*SP*/ +#define raise_constant caml_raise_constant +#define raise_with_arg caml_raise_with_arg +#define raise_with_string caml_raise_with_string +#define failwith caml_failwith +#define invalid_argument caml_invalid_argument +#define array_bound_error caml_array_bound_error /*SP*/ +#define raise_out_of_memory caml_raise_out_of_memory +#define raise_stack_overflow caml_raise_stack_overflow +#define raise_sys_error caml_raise_sys_error +#define raise_end_of_file caml_raise_end_of_file +#define raise_zero_divide caml_raise_zero_divide +#define raise_not_found caml_raise_not_found +#define raise_sys_blocked_io caml_raise_sys_blocked_io +/* **** floats.c */ +#define copy_double caml_copy_double +/* **** memory.c */ +#define alloc_shr caml_alloc_shr +#define initialize caml_initialize +#define modify caml_modify +#define stat_alloc caml_stat_alloc +#define stat_free caml_stat_free +#define stat_resize caml_stat_resize +/* **** str.c */ +#define string_length caml_string_length +#endif + CAMLexport value copy_memblock_indirected (void *src, asize_t size); value alloc_memblock_indirected (asize_t size); CAMLexport value ml_alloc_custom(struct custom_operations * ops, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/tools/dune new/ocaml-lablgtk3-3.1.3/tools/dune --- old/ocaml-lablgtk3-3.1.2/tools/dune 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/tools/dune 2022-10-06 09:24:16.000000000 +0200 @@ -18,7 +18,8 @@ (executables (names varcc propcc) - (modules varcc propcc)) + (modules varcc propcc) + (libraries camlp-streams)) (executable (name dune_config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/tools/gtkdoc.ml new/ocaml-lablgtk3-3.1.3/tools/gtkdoc.ml --- old/ocaml-lablgtk3-3.1.2/tools/gtkdoc.ml 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/tools/gtkdoc.ml 2022-10-06 09:24:16.000000000 +0200 @@ -20,7 +20,7 @@ (* *) (**************************************************************************) -let default_base_uri = "http://developer.gnome.org/gtk3/stable"; +let default_base_uri = "http://developer-old.gnome.org/gtk3/stable"; let base_uri = ref default_base_uri let _ = Odoc_args.add_option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk3-3.1.2/tools/varcc.ml4 new/ocaml-lablgtk3-3.1.3/tools/varcc.ml4 --- old/ocaml-lablgtk3-3.1.2/tools/varcc.ml4 2021-12-24 08:58:00.000000000 +0100 +++ new/ocaml-lablgtk3-3.1.3/tools/varcc.ml4 2022-10-06 09:24:16.000000000 +0200 @@ -127,7 +127,8 @@ (* Output table to code file *) oc "/* %s : conversion table */\n" name; let static = - if !static && not (List.mem "public" ~set:flags) || List.mem "private" ~set:flags + if !static && not (List.mem "public" ~set:flags) + || List.mem "private" ~set:flags then "static " else "" in oc "%sconst lookup_info ml_table_%s[] = {\n" static name; may guard @@ -213,7 +214,8 @@ List.iter convs ~f: begin fun (_,s,_,flags) -> let conv = - if List.mem "flags" ~set:flags then "Gobject.Data.flags" else enum in + if List.mem "flags" ~set:flags then "Gobject.Data.flags" else enum + in out "@ let %s = %s %s_tbl" s conv s end; out "@]@.end@.";
