Hello community, here is the log from the commit of package ocaml-lablgtk2 for openSUSE:Factory checked in at 2020-02-06 13:08:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-lablgtk2 (Old) and /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-lablgtk2" Thu Feb 6 13:08:59 2020 rev:16 rq:770453 version:2.18.10 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-lablgtk2/ocaml-lablgtk2.changes 2019-11-27 13:52:41.892402163 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-lablgtk2.new.26092/ocaml-lablgtk2.changes 2020-02-06 13:09:09.152366417 +0100 @@ -1,0 +2,6 @@ +Thu Jan 30 07:07:07 UTC 2020 - [email protected] + +- Update to version 2.18.10. + prepare for ocaml-4.10 + +------------------------------------------------------------------- Old: ---- ocaml-lablgtk2-2.18.8.tar.xz New: ---- ocaml-lablgtk2-2.18.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgtk2.spec ++++++ --- /var/tmp/diff_new_pack.3HxYDY/_old 2020-02-06 13:09:09.900366824 +0100 +++ /var/tmp/diff_new_pack.3HxYDY/_new 2020-02-06 13:09:09.904366827 +0100 @@ -16,7 +16,7 @@ # -Version: 2.18.8 +Version: 2.18.10 Release: 0 %{?ocaml_preserve_bytecode} %global __ocaml_requires_opts -i GtkSourceView_types -i GtkSourceView2_types ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3HxYDY/_old 2020-02-06 13:09:09.936366843 +0100 +++ /var/tmp/diff_new_pack.3HxYDY/_new 2020-02-06 13:09:09.936366843 +0100 @@ -2,9 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/garrigue/lablgtk.git</param> <param name="scm">git</param> - <param name="versionformat">2.18.8</param> - <!-- 2.18.8 --> - <param name="revision">lablgtk2188</param> + <param name="versionformat">@PARENT_TAG@</param> + <!-- 2.18.10 --> + <param name="revision">d66addf4e9dc5ed489e85529475645996afa68a8</param> <param name="filename">ocaml-lablgtk2</param> <param name="exclude">.cvsignore</param> <param name="exclude">applications</param> ++++++ ocaml-lablgtk2-2.18.8.tar.xz -> ocaml-lablgtk2-2.18.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/CHANGES new/ocaml-lablgtk2-2.18.10/CHANGES --- old/ocaml-lablgtk2-2.18.8/CHANGES 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/CHANGES 2020-01-23 15:38:11.000000000 +0100 @@ -1,5 +1,21 @@ LablGTK changes log +In Lablgtk-2.18.10: + +2020.01.23 [Jacques] + * headers changed again in ocaml 4.10.0beta2 + * fix C compilation warnings + * fix SourceMarkAttributes.new_attribute + +In Lablgtk-2.18.9: + +2020.01.13 [Jacques] + * release new version, du to C header changes in ocaml 4.10 + * fix example for sourceview2 (#66) [Pieter Goetschalckx] + +2019.11.27 [Jacques] + * remove declaration of young_start for ocaml 4.10 (#93) + In Lablgtk-2.18.8: 2019.4.25 [Jacques] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/README new/ocaml-lablgtk2-2.18.10/README --- old/ocaml-lablgtk2-2.18.8/README 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/README 2020-01-23 15:38:11.000000000 +0100 @@ -1,5 +1,5 @@ - LablGTK2 2.18.8 : an interface to the GIMP Tool Kit + LablGTK2 2.18.10 : an interface to the GIMP Tool Kit Needed: ocaml-4.05 or more diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gdk.c new/ocaml-lablgtk2-2.18.10/src/ml_gdk.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gdk.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gdk.c 2020-01-23 15:38:11.000000000 +0100 @@ -57,7 +57,7 @@ CAMLprim void ml_raise_gdk (const char *errmsg) { - static value * exn = NULL; + static const value * exn = NULL; if (exn == NULL) exn = caml_named_value ("gdkerror"); raise_with_string (*exn, (char*)errmsg); @@ -478,7 +478,7 @@ switch (format) { case 8: data = alloc_string (nitems); - memcpy (String_val(data), xdata, sizeof(char) * nitems); + memcpy (Bytes_val(data), xdata, sizeof(char) * nitems); tag = MLTAG_BYTES; break; case 16: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gdkpixbuf.c new/ocaml-lablgtk2-2.18.10/src/ml_gdkpixbuf.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gdkpixbuf.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gdkpixbuf.c 2020-01-23 15:38:11.000000000 +0100 @@ -304,9 +304,9 @@ { char *s; value pair = Field(cell, 0); - s = String_val(Field(pair, 0)); + s = Bytes_val(Field(pair, 0)); *opt_k[i] = copy ? g_strdup (s) : s; - s = String_val(Field(pair, 1)); + s = Bytes_val(Field(pair, 1)); *opt_v[i] = copy ? g_strdup (s) : s; cell = Field(cell, 1); } @@ -345,7 +345,7 @@ value *cb = data; value res, s; s = alloc_string (count); - memcpy (String_val(s), buf, count); + memcpy (Bytes_val(s), buf, count); res = callback_exn (*cb, s); if (Is_exception_result (res)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_glib.c new/ocaml-lablgtk2-2.18.10/src/ml_glib.c --- old/ocaml-lablgtk2-2.18.8/src/ml_glib.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_glib.c 2020-01-23 15:38:11.000000000 +0100 @@ -87,7 +87,7 @@ static void ml_raise_glib (const char *errmsg) { - static value * exn = NULL; + static const value * exn = NULL; if (exn == NULL) exn = caml_named_value ("gerror"); raise_with_string (*exn, (char*)errmsg); @@ -133,7 +133,7 @@ struct exn_data { GQuark domain; char *caml_exn_name; - value *caml_exn; + const value *caml_exn; }; CAMLprim void ml_register_exn_map (GQuark domain, char *caml_name) @@ -145,7 +145,7 @@ exn_map = g_slist_prepend (exn_map, exn_data); } -static value *lookup_exn_map (GQuark domain) +static const value *lookup_exn_map (GQuark domain) { GSList *l = exn_map; struct exn_data *exn_data; @@ -160,8 +160,8 @@ return NULL; } -static void ml_raise_gerror_exn(GError *, value *) Noreturn; -static void ml_raise_gerror_exn(GError *err, value *exn) +static void ml_raise_gerror_exn(GError *, const value *) Noreturn; +static void ml_raise_gerror_exn(GError *err, const value *exn) { CAMLparam0(); CAMLlocal2(b, msg); @@ -178,7 +178,7 @@ static void ml_raise_generic_gerror (GError *) Noreturn; static void ml_raise_generic_gerror (GError *err) { - static value *exn; + static const value *exn; value msg; if (exn == NULL) { exn = caml_named_value ("gerror"); @@ -192,7 +192,7 @@ CAMLprim void ml_raise_gerror(GError *err) { - value *caml_exn; + const value *caml_exn; g_assert (err); caml_exn = lookup_exn_map (err->domain); if (caml_exn) @@ -368,7 +368,7 @@ { gsize read; switch (g_io_channel_read(GIOChannel_val(io), - String_val(str) + Int_val(offset), + Bytes_val(str) + Int_val(offset), Int_val(count), &read)) { case G_IO_ERROR_NONE: @@ -390,7 +390,7 @@ GError *err = NULL; GIOStatus result = g_io_channel_read_chars(GIOChannel_val(io), - String_val(str) + Int_val(offset), + Bytes_val(str) + Int_val(offset), Int_val(count), &read, &err); @@ -463,7 +463,7 @@ value v; g_assert (str != NULL); v = alloc_string (len); - memcpy (String_val(v), str, len); + memcpy (Bytes_val(v), str, len); g_free (str); return v; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gpointer.c new/ocaml-lablgtk2-2.18.10/src/ml_gpointer.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gpointer.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gpointer.c 2020-01-23 15:38:11.000000000 +0100 @@ -33,7 +33,7 @@ CAMLprim value ml_stable_copy (value v) { - if (Is_block(v) && (char*)(v) < young_end && (char*)(v) > young_start) + if (Is_young_block(v)) { CAMLparam1(v); mlsize_t i, wosize = Wosize_val(v); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gtk.c new/ocaml-lablgtk2-2.18.10/src/ml_gtk.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gtk.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gtk.c 2020-01-23 15:38:11.000000000 +0100 @@ -43,7 +43,7 @@ void ml_raise_gtk (const char *errmsg) { - static value * exn = NULL; + static const value * exn = NULL; if (exn == NULL) exn = caml_named_value ("gtkerror"); raise_with_string (*exn, (char*)errmsg); @@ -397,7 +397,7 @@ CAMLparam2 (w, n); CAMLlocal1 (ret); GtkWidget *widget = GtkWidget_val (w); - gchar *name = String_val (n); + gchar *name = Bytes_val (n); GParamSpec * pspec; pspec = gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget), name); @@ -448,7 +448,7 @@ alloc (Wosize_asize(n_targets * sizeof(GtkTargetEntry)), Abstract_tag); for (i=0; i<n_targets; i++) { - targets[i].target = String_val(Field(Field(t, i), 0)); + targets[i].target = Bytes_val(Field(Field(t, i), 0)); targets[i].flags = Flags_Target_flags_val(Field(Field(t, i), 1)); targets[i].info = Int_val(Field(Field(t, i), 2)); } @@ -485,7 +485,7 @@ alloc (Wosize_asize(n_targets * sizeof(GtkTargetEntry)), Abstract_tag); for (i=0; i<n_targets; i++) { - targets[i].target = String_val(Field(Field(t, i), 0)); + targets[i].target = Bytes_val(Field(Field(t, i), 0)); targets[i].flags = Flags_Target_flags_val(Field(Field(t, i), 1)); targets[i].info = Int_val(Field(Field(t, i), 2)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gtksourceview2.c new/ocaml-lablgtk2-2.18.10/src/ml_gtksourceview2.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gtksourceview2.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gtksourceview2.c 2020-01-23 15:38:11.000000000 +0100 @@ -112,7 +112,7 @@ static gpointer string_val(value v) { - return String_val(v); + return Bytes_val(v); } GSList *ml_gslist_of_string_list(value list) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gtkstock.c new/ocaml-lablgtk2-2.18.10/src/ml_gtkstock.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gtkstock.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gtkstock.c 2020-01-23 15:38:11.000000000 +0100 @@ -104,8 +104,8 @@ CAMLprim value ml_gtk_stock_add(value item) { GtkStockItem it; - it.stock_id = String_val(Field(item, 0)); - it.label = String_val(Field(item, 1)); + it.stock_id = Bytes_val(Field(item, 0)); + it.label = Bytes_val(Field(item, 1)); it.modifier = Flags_GdkModifier_val(Field(item, 2)) ; it.keyval = Int_val(Field(item, 3)); it.translation_domain = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/ml_gtktree.c new/ocaml-lablgtk2-2.18.10/src/ml_gtktree.c --- old/ocaml-lablgtk2-2.18.8/src/ml_gtktree.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/ml_gtktree.c 2020-01-23 15:38:11.000000000 +0100 @@ -525,7 +525,7 @@ , Abstract_tag ); for (i=0; i<n_targets; i++) { - targets[i].target = String_val(Field(Field(t, i), 0)); + targets[i].target = Bytes_val(Field(Field(t, i), 0)); targets[i].flags = Flags_Target_flags_val(Field(Field(t, i), 1)); targets[i].info = Int_val(Field(Field(t, i), 2)); } @@ -551,7 +551,7 @@ , Abstract_tag ); for (i=0; i<n_targets; i++) { - targets[i].target = String_val(Field(Field(t, i), 0)); + targets[i].target = Bytes_val(Field(Field(t, i), 0)); targets[i].flags = Flags_Target_flags_val(Field(Field(t, i), 1)); targets[i].info = Int_val(Field(Field(t, i), 2)); } @@ -1151,9 +1151,7 @@ /* Ideally, the user would already have ensured all these were stable... and in any case, it is always up to the user to ensure that they will not get garbage collected */ - if((Is_block(v1) && (char*)v1 < (char*)caml_young_end && (char*)v1 > (char*)caml_young_start) || - (Is_block(v2) && (char*)v2 < (char*)caml_young_end && (char*)v2 > (char*)caml_young_start) || - (Is_block(v3) && (char*)v3 < (char*)caml_young_end && (char*)v3 > (char*)caml_young_start)) + if(Is_young_block(v1) || Is_young_block(v2) || Is_young_block(v3)) { caml_register_global_root (&v1); caml_register_global_root (&v2); @@ -1489,8 +1487,8 @@ GObject *obj = GObject_val(custom_model); g_return_val_if_fail (IS_CUSTOM_MODEL (obj),Val_unit); if(Is_block(callback_object) && - (char*)callback_object < (char*)caml_young_end && - (char*)callback_object > (char*)caml_young_start) + (char*)callback_object < (char*)young_end && + (char*)callback_object > (char*)young_start) { caml_register_global_root (&callback_object); caml_minor_collection(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/wrappers.c new/ocaml-lablgtk2-2.18.10/src/wrappers.c --- old/ocaml-lablgtk2-2.18.8/src/wrappers.c 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/wrappers.c 2020-01-23 15:38:11.000000000 +0100 @@ -99,7 +99,7 @@ void ml_raise_null_pointer () { - static value * exn = NULL; + static const value * exn = NULL; if (exn == NULL) exn = caml_named_value ("null_pointer"); raise_constant (*exn); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-lablgtk2-2.18.8/src/wrappers.h new/ocaml-lablgtk2-2.18.10/src/wrappers.h --- old/ocaml-lablgtk2-2.18.8/src/wrappers.h 2019-04-25 09:50:10.000000000 +0200 +++ new/ocaml-lablgtk2-2.18.10/src/wrappers.h 2020-01-23 15:38:11.000000000 +0100 @@ -33,7 +33,13 @@ #include <caml/mlvalues.h> #include <caml/fail.h> #include <caml/custom.h> -CAMLextern char *young_start, *young_end; /* from minor_gc.h */ +#include <caml/minor_gc.h> +#define Is_young_block(v) \ + (Is_block(v) && (value*)(v) < young_end && (value*)(v) > young_start) + +#ifndef Bytes_val +#define Bytes_val String_val +#endif CAMLexport value copy_memblock_indirected (void *src, asize_t size); value alloc_memblock_indirected (asize_t size);
