Hello community,
here is the log from the commit of package lablgtk2
checked in at Mon Apr 21 18:48:39 CEST 2008.
--------
--- lablgtk2/lablgtk2.changes 2008-01-29 12:00:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/lablgtk2/lablgtk2.changes 2008-04-21 13:06:13.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 21 13:03:48 CEST 2008 - seife@suse.de
+
+- update to version 2.10.1
+ - fix wrong type in GContainer.mli (could not compile with 3.10.2)
+ - revert to setting LC_NUMERIC to C (ocaml still uses strtod)
+ - Fix Val_GType/GType_val (use Val_addr/Addr_val)
+ - add ui_manager#as_ui_manager
+ - Fix examples.
+
+-------------------------------------------------------------------
Old:
----
lablgtk-2.10.0.tar.gz
New:
----
lablgtk-2.10.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lablgtk2.spec ++++++
--- /var/tmp/diff_new_pack.KW2808/_old 2008-04-21 18:47:44.000000000 +0200
+++ /var/tmp/diff_new_pack.KW2808/_new 2008-04-21 18:47:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package lablgtk2 (Version 2.10.0)
+# spec file for package lablgtk2 (Version 2.10.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: lablgtk2
BuildRequires: gtk2-devel librsvg-devel ocaml xorg-x11
%if 0%{?suse_version} >= 1010
@@ -20,7 +21,7 @@
Group: Development/Libraries/Other
Requires: ocaml
AutoReqProv: on
-Version: 2.10.0
+Version: 2.10.1
Release: 1
Source0: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-%{version}.tar.gz
Source1: rpmlintrc
@@ -46,6 +47,7 @@
Koji Kagawa
%package devel
+License: LGPL v2.1 or later
Summary: An Objective Caml interface to gtk2+
Group: Development/Libraries/Other
Provides: lablgtk2:/usr/lib/ocaml/lablgtk2/glib.cmi
@@ -113,6 +115,13 @@
%{_libdir}/ocaml/lablgtk2/*.h
%changelog
+* Mon Apr 21 2008 seife@suse.de
+- update to version 2.10.1
+ - fix wrong type in GContainer.mli (could not compile with 3.10.2)
+ - revert to setting LC_NUMERIC to C (ocaml still uses strtod)
+ - Fix Val_GType/GType_val (use Val_addr/Addr_val)
+ - add ui_manager#as_ui_manager
+ - Fix examples.
* Tue Jan 29 2008 seife@suse.de
- update to version 2.10.0
- uses features of newer Gtk versions
++++++ lablgtk-2.10.0.tar.gz -> lablgtk-2.10.1.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/applications/browser/searchpos.ml new/lablgtk-2.10.1/applications/browser/searchpos.ml
--- old/lablgtk-2.10.0/applications/browser/searchpos.ml 2007-09-25 17:32:38.000000000 +0200
+++ new/lablgtk-2.10.1/applications/browser/searchpos.ml 2007-09-25 17:30:14.000000000 +0200
@@ -21,7 +21,7 @@
(* *)
(**************************************************************************)
-(* $Id: searchpos.ml 1378 2007-09-25 15:32:38Z garrigue $ *)
+(* $Id: searchpos.ml 1377 2007-09-25 15:30:14Z garrigue $ *)
open StdLabels
open Parsetree
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/CHANGES new/lablgtk-2.10.1/CHANGES
--- old/lablgtk-2.10.0/CHANGES 2007-09-25 16:34:38.000000000 +0200
+++ new/lablgtk-2.10.1/CHANGES 2008-02-26 01:21:39.000000000 +0100
@@ -1,9 +1,26 @@
-$Id: CHANGES 1376 2007-09-25 14:34:38Z garrigue $
+$Id: CHANGES 1397 2008-02-26 00:21:39Z garrigue $
+
+In lablgtk-2.10.1:
+2008.02.26 [Jacques]
+ * fix wrong type in GContainer.mli (could not compile with 3.10.2)
+
+2007.12.01 [Jacques]
+ * revert to setting LC_NUMERIC to C (ocaml still uses strtod)
+
+2007.11.28 [Jacques]
+ * Fix Val_GType/GType_val (use Val_addr/Addr_val)
+
+2007.10.09 [Benjamin]
+ * add ui_manager#as_ui_manager
+
+2007.09.27 [Jacques]
+ * Fix examples.
In lablgtk-2.10.0:
2007.09.25 [Jacques]
* Various preparations for release.
- * Use the "Glade for Windows" distribution for win32, supporting glade and rsvg.
+ * Use the "Glade for Windows" distribution for win32,
+ supporting glade and rsvg.
2007.08.17 [Jacques]
* some more patch by Julien Moutinho (style and Rc).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/examples/assistant.ml new/lablgtk-2.10.1/examples/assistant.ml
--- old/lablgtk-2.10.0/examples/assistant.ml 2007-08-08 15:17:06.000000000 +0200
+++ new/lablgtk-2.10.1/examples/assistant.ml 2007-09-27 04:12:42.000000000 +0200
@@ -16,7 +16,7 @@
let box = GPack.vbox ()
in
- ignore (assistant#insert_page box#as_widget 0);
+ ignore (assistant#append_page box#as_widget);
assistant#set_page_complete box#as_widget true;
prerr_endline "Complete";
assistant#set_page_type box#as_widget `SUMMARY;
@@ -28,6 +28,7 @@
Format.printf "Got:%a@." GUtil.print_widget button;
GtkButton.LinkButton.set_uri_hook
(fun _ s -> Format.printf "Got url '%s'@." s; button#set_uri "AGAIN");
+ assistant#connect#close GMain.quit;
assistant#show ();
Main.main ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/examples/GL/aargb.ml new/lablgtk-2.10.1/examples/GL/aargb.ml
--- old/lablgtk-2.10.0/examples/GL/aargb.ml 2007-07-12 10:56:18.000000000 +0200
+++ new/lablgtk-2.10.1/examples/GL/aargb.ml 2007-09-27 04:12:42.000000000 +0200
@@ -7,7 +7,7 @@
(* *)
(**************************************************************************)
-(* $Id: aargb.ml 1352 2007-07-12 08:56:18Z zoggy $ *)
+(* $Id: aargb.ml 1385 2007-09-27 02:12:42Z garrigue $ *)
let init () =
List.iter Gl.enable [`line_smooth; `blend];
@@ -18,7 +18,7 @@
let rot_angle = ref 0.
-let display () =
+let display ~area () =
GlClear.clear [`color];
GlDraw.color (0., 1., 0.);
GlMat.push ();
@@ -36,7 +36,8 @@
GlDraw.vertex2 (-0.5, -0.5);
GlDraw.ends ();
GlMat.pop ();
- Gl.flush ()
+ Gl.flush ();
+ area#swap_buffers ()
let reshape ~width:w ~height:h =
GlDraw.viewport ~x:0 ~y:0 ~w ~h;
@@ -55,18 +56,18 @@
let w = GWindow.window ~title:"Antialiasing/Gtk" () in
w#connect#destroy ~callback:GMain.quit;
let area =
- GlGtk.area [`RGBA]
+ GlGtk.area [`RGBA;`DOUBLEBUFFER]
~width:500 ~height:500 ~packing:w#add () in
area#connect#realize ~callback:init;
area#connect#reshape ~callback:reshape;
- area#connect#display ~callback:display;
+ area#connect#display ~callback:(display ~area);
w#event#connect#key_press ~callback:
begin fun ev ->
let key = GdkEvent.Key.keyval ev in
if key = _r || key = _R then begin
rot_angle := !rot_angle +. 20.;
if !rot_angle > 360. then rot_angle := 0.;
- display ()
+ display ~area ()
end;
true
end;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/examples/link_button.ml new/lablgtk-2.10.1/examples/link_button.ml
--- old/lablgtk-2.10.0/examples/link_button.ml 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/examples/link_button.ml 2007-09-27 04:12:42.000000000 +0200
@@ -7,7 +7,7 @@
(* *)
(**************************************************************************)
-(* $Id: link_button.ml 1347 2007-06-20 07:40:34Z guesdon $ *)
+(* $Id: link_button.ml 1385 2007-09-27 02:12:42Z garrigue $ *)
open GMain
@@ -25,6 +25,7 @@
Format.printf "Got:%a@." GUtil.print_widget button;
GtkButton.LinkButton.set_uri_hook
(fun _ s -> Format.printf "Got url '%s'@." s; button#set_uri "AGAIN");
+ window#connect#destroy GMain.quit;
window#show ();
Main.main ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/examples/sourceview/test.ml new/lablgtk-2.10.1/examples/sourceview/test.ml
--- old/lablgtk-2.10.0/examples/sourceview/test.ml 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/examples/sourceview/test.ml 2007-09-27 04:12:42.000000000 +0200
@@ -37,7 +37,7 @@
~hpolicy: `AUTOMATIC ~vpolicy: `AUTOMATIC
~packing:vbox#add ()
let source_view =
- GSourceview.source_view
+ GSourceView.source_view
~auto_indent:true
~insert_spaces_instead_of_tabs:true ~tabs_width:2
~show_line_numbers:true
@@ -47,7 +47,7 @@
()
(* let languages_manager =
GSourceView.source_languages_manager ~lang_files_dirs:["/etc"] () *)
-let languages_manager = GSourceview.source_languages_manager ()
+let languages_manager = GSourceView.source_languages_manager ()
let lang =
if use_mime_type then
@@ -56,14 +56,14 @@
| Some lang -> lang
else
match
- GSourceview.source_language_from_file ~languages_manager lang_file
+ GSourceView.source_language_from_file ~languages_manager lang_file
with
| None -> failwith (sprintf "can't load %s" lang_file)
| Some lang -> lang
let matching_bracket () =
let iter = source_view#source_buffer#get_iter_at_mark `INSERT in
- match GSourceview.find_matching_bracket iter with
+ match GSourceView.find_matching_bracket iter with
| None -> prerr_endline "no matching bracket"
| Some iter ->
source_view#source_buffer#place_cursor iter;
@@ -92,7 +92,7 @@
(* set a style for bracket matching *)
source_view#source_buffer#set_check_brackets true;
let _ =
- let st = GSourceview.source_tag_style
+ let st = GSourceView.source_tag_style
~background_by_name:"green"
~foreground_by_name:"yellow"
~bold: true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/examples/text/test_text.ml new/lablgtk-2.10.1/examples/text/test_text.ml
--- old/lablgtk-2.10.0/examples/text/test_text.ml 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/examples/text/test_text.ml 2007-09-27 04:12:42.000000000 +0200
@@ -52,6 +52,7 @@
let s = f_to_string "test.txt" in
b#set_text s;
GText.view ~buffer:b ~packing:(sw#add) ();
+ w#connect#destroy GMain.quit;
w#show ();;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/README new/lablgtk-2.10.1/README
--- old/lablgtk-2.10.0/README 2007-09-25 16:34:38.000000000 +0200
+++ new/lablgtk-2.10.1/README 2007-12-01 09:56:31.000000000 +0100
@@ -10,29 +10,24 @@
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
Status:
- LablGtk2 is now pretty stable, but it has not been as thoroughly
- tested as LablGtk.
+ LablGtk2 is now pretty stable.
- Support for the old text widget has been dropped, but it is
- replaced by a new one, much more powerful (thanks to Benjamin
- Monate).
-
- Another important change in gtk-2 is the use of unicode (utf8) for
+ An important change in gtk-2 is the use of unicode (utf8) for
all strings. If you use non-ascii strings, you must imperatively
convert them to unicode. This can be done with the
[Glib.Convert.locale_to_utf8] function. If your input is already in
utf8, it is still a good idea to validate it with
Glib.Utf8.validate, as malformed utf8 strings may cause segmentation
faults.
- Note that setlocale is now always called, except if you set
- GTK_SETLOCALE to 0 in the environment.
-
- There are of course many other changes and additions.
+ Note that setlocale is now always called (except if you set
+ GTK_SETLOCALE to 0 in the environment), but LC_NUMERIC is reverted
+ to "C" to avoid problems with floating point conversion in Caml.
- Note that some widgets are only supported in newer versions of GTK+
- (post 2.3). If you use them in older versions, you will get a runtime
- error:
+ Note that some widgets are only supported in newer versions of GTK+.
+ If you use them in older versions, you will get a runtime error:
Failure "Gobject.unsafe_create : type GtkActionGroup is not yet defined"
+ For unsupported methods, the error message is a bit clearer:
+ Failure "gdk_pixbuf_get_file_info unsupported in Gtk 2.x < 2.4"
How to compile:
@@ -58,9 +53,12 @@
--with-rsvg --without-rsvg: override autodetected librsvg support
--with-gnomecanvas --without-gnomecanvas:
override autodetected libgnomecanvas support
- --with-gnomeui --without-gnomeui: override autodetected libgnomeui support
- --with-panel --without-panel: override autodetected libpanelapplet support
- --with-gtkspell --without-gtkspell: override autodetected gtkspell support
+ --with-gnomeui --without-gnomeui:
+ override autodetected libgnomeui support
+ --with-panel --without-panel:
+ override autodetected libpanelapplet support
+ --with-gtkspell --without-gtkspell:
+ override autodetected gtkspell support
--with-gtksourceview --without-gtksourceview:
override autodetected gtksourceview support
--enable-debug: enable debug mode
@@ -85,18 +83,17 @@
examples/*.ml various examples
applications/browser an ongoing port of ocamlbrowser
- applications/unison a patch for unison-2.9.45
+ applications/camlirc an IRC client (by Nobuaki Yoshida)
How to run the examples:
In the examples directory just type:
lablgtk2 ???.ml
- Before installing lablgtk2 you have to be more explicit:
- setenv CAML_LD_LIBRARY_PATH ../src (or export CAML..PATH=../src)
- ../src/lablgtktop -w s -I ../src ???.ml
+ Before installing lablgtk2 you have to use -localdir:
+ ../src/lablgtk2 -localdir ???.ml
How to link them:
- lablgtktop contains an extra module GtkInit, whose only contents is:
+ The lablgtk2 script loads an extra module GtkInit, whose only contents is:
let locale = GtkMain.Main.init ()
You must either add this line, or add this module to your link,
before calling any Gtk function.
@@ -104,7 +101,7 @@
How to use the threaded toplevel:
- % lablgtk2 -thread (or ./lablgtktop_t before installing)
+ % lablgtk2 -thread
Objective Caml version 3.09
# let w = GWindow.window ~show:true ();;
@@ -367,4 +364,4 @@
Bug reports:
Jacques Garrigue
-$Id: README 1376 2007-09-25 14:34:38Z garrigue $
+$Id: README 1392 2007-12-01 08:56:31Z garrigue $
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/gAction.ml new/lablgtk-2.10.1/src/gAction.ml
--- old/lablgtk-2.10.0/src/gAction.ml 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/src/gAction.ml 2007-10-09 19:02:53.000000000 +0200
@@ -231,7 +231,7 @@
method private obj = obj
inherit OgtkActionProps.ui_manager_props
method connect = new ui_manager_signals obj
-
+ method as_ui_manager = (obj:> Gtk.ui_manager Gtk.obj)
method insert_action_group (g : action_group) =
UIManager.insert_action_group obj g#as_group
method remove_action_group (g : action_group) =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/gAction.mli new/lablgtk-2.10.1/src/gAction.mli
--- old/lablgtk-2.10.0/src/gAction.mli 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/src/gAction.mli 2007-10-09 19:02:53.000000000 +0200
@@ -271,6 +271,7 @@
([> Gtk.ui_manager] as 'a) Gtk.obj ->
object
val obj : 'a Gtk.obj
+ method as_ui_manager : Gtk.ui_manager Gtk.obj
method add_tearoffs : bool
method add_ui_from_file : string -> ui_id (** @raise Glib.Markup.Error if the XML is invalid
@raise Glib.GError if an error occurs while reading the file *)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/gContainer.mli new/lablgtk-2.10.1/src/gContainer.mli
--- old/lablgtk-2.10.0/src/gContainer.mli 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/src/gContainer.mli 2008-02-26 01:21:39.000000000 +0100
@@ -20,7 +20,7 @@
(* *)
(**************************************************************************)
-(* $Id: gContainer.mli 1347 2007-06-20 07:40:34Z guesdon $ *)
+(* $Id: gContainer.mli 1397 2008-02-26 00:21:39Z garrigue $ *)
open Gtk
open GObj
@@ -92,11 +92,12 @@
(** @gtkdoc gtk GtkContainer *)
val pack_container :
- create:([> Gtk.container] Gobject.param list -> (#GObj.widget as 'a)) ->
- [> Gtk.container] Gobject.param list ->
+ create:(([> Gtk.container] as 'a) Gobject.param list ->
+ (#GObj.widget as 'b)) ->
+ 'a Gobject.param list ->
?border_width:int ->
?width:int ->
- ?height:int -> ?packing:(GObj.widget -> unit) -> ?show:bool -> unit -> 'a
+ ?height:int -> ?packing:(GObj.widget -> unit) -> ?show:bool -> unit -> 'b
(** {3 GtkBin} *)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/gtkMain.ml new/lablgtk-2.10.1/src/gtkMain.ml
--- old/lablgtk-2.10.0/src/gtkMain.ml 2007-08-17 05:24:07.000000000 +0200
+++ new/lablgtk-2.10.1/src/gtkMain.ml 2007-12-01 09:56:31.000000000 +0100
@@ -20,7 +20,7 @@
(* *)
(**************************************************************************)
-(* $Id: gtkMain.ml 1361 2007-08-17 03:24:07Z garrigue $ *)
+(* $Id: gtkMain.ml 1392 2007-12-01 08:56:31Z garrigue $ *)
open StdLabels
open Gtk
@@ -43,6 +43,7 @@
with Error err ->
raise (Error ("GtkMain.init: initialization failed\n" ^ err))
in
+ if setlocale then ignore (Glib.Main.setlocale `NUMERIC (Some "C"));
Array.blit ~src:argv ~dst:Sys.argv ~len:(Array.length argv)
~src_pos:0 ~dst_pos:0;
Obj.truncate (Obj.repr Sys.argv) (Array.length argv);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/gUtil.mli new/lablgtk-2.10.1/src/gUtil.mli
--- old/lablgtk-2.10.0/src/gUtil.mli 2007-06-20 09:40:34.000000000 +0200
+++ new/lablgtk-2.10.1/src/gUtil.mli 2008-01-18 02:17:21.000000000 +0100
@@ -20,17 +20,19 @@
(* *)
(**************************************************************************)
-(* $Id: gUtil.mli 1347 2007-06-20 07:40:34Z guesdon $ *)
+(* $Id: gUtil.mli 1393 2008-01-18 01:17:21Z garrigue $ *)
+
+(** {3 Utility classes for programming with GTK objects} *)
open GObj
-(* A nice function to use with [#install_printer] *)
+(** A nice function to use with [#install_printer] *)
val print_widget : Format.formatter -> #widget -> unit
-(* The memo class provides an easy way to remember the real class of
+(** The memo class provides an easy way to remember the real class of
a widget.
- Insert all widgets of class in one single t memo, and you can then
- recover their original ML object with #find.
+ Insert all widgets of class in one single [t memo], and you can then
+ recover their original ML object with [#find].
*)
class ['a] memo : unit ->
@@ -42,8 +44,8 @@
method remove : widget -> unit
end
-(* The ML signal mechanism allows one to add GTK-like signals to
- arbitrary objects.
+(** {4 The ML signal mechanism}
+ It allows one to add GTK-like signals to arbitrary objects.
*)
val next_callback_id : unit -> GtkSignal.id
@@ -57,7 +59,8 @@
method connect : after:bool -> callback:('a -> unit) -> GtkSignal.id
method disconnect : GtkSignal.id -> bool
end
-(* As with GTK signals, you can use [GtkSignal.stop_emit] inside a
+
+(** As with GTK signals, you can use [GtkSignal.stop_emit] inside a
callback to prevent other callbacks from being called. *)
class virtual ml_signals : (GtkSignal.id -> bool) list ->
@@ -74,8 +77,8 @@
val mutable disconnectors : (GtkSignal.id -> bool) list
end
-(* To add ML signals to a LablGTK object:
-
+(** To add ML signals to a LablGTK object:
+{[
class mywidget_signals obj ~mysignal1 ~mysignal2 = object
inherit somewidget_signals obj
inherit add_ml_signals obj [mysignal1#disconnect; mysignal2#disconnect]
@@ -91,18 +94,20 @@
method call1 = mysignal1#call
method call2 = mysignal2#call
end
-
+]}
You can also add ML signals to an arbitrary object; just inherit
from [ml_signals] in place of [widget_signals]+[add_ml_signals].
-
- class mysignals ~mysignal1 ~mysignal2 = object
+{[
+ class mysignals ~mysignal1 ~mysignal2 = object
inherit ml_signals [mysignal1#disconnect; mysignal2#disconnect]
method mysignal1 = mysignal1#connect ~after
method mysignal2 = mysignal2#connect ~after
end
+]}
*)
-(* The variable class provides an easy way to propagate state modifications.
+(** {4 Propagating state modifications}
+ The variable class provides an easy way to propagate state modifications.
A new variable is created by [new variable init]. The [#set] method just
calls the [set] signal, which by default only calls [real_set].
[real_set] sets the variable and calls [changed] when needed.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/Makefile new/lablgtk-2.10.1/src/Makefile
--- old/lablgtk-2.10.0/src/Makefile 2007-09-25 12:56:49.000000000 +0200
+++ new/lablgtk-2.10.1/src/Makefile 2008-01-18 02:17:21.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: Makefile 1373 2007-09-25 10:56:49Z garrigue $
+# $Id: Makefile 1393 2008-01-18 01:17:21Z garrigue $
# Makefile for lablgtk.
COMPILER = $(CAMLC) $(MLFLAGS) $(MLBYTEFLAGS) -w s -c
@@ -467,20 +467,19 @@
rm -f \#*\# *~
-DOCFILES = gaux.ml gpointer.mli glib.mli gobject.mli \
+DOCFILES = gPango.ml gDraw.mli gObj.mli gMain.mli gData.mli \
+ gContainer.mli gBin.mli gPack.mli gButton.mli gText.mli \
+ gMenu.mli gMisc.mli gTree.mli gFile.mli gList.mli gWindow.mli \
+ gEdit.mli gRange.mli gAction.mli gUtil.mli gToolbox.mli gBroken.mli \
+ gaux.ml gpointer.mli glib.mli gobject.mli \
gdkEnums.ml pangoEnums.ml gtkEnums.ml \
gdk.mli gdkEvent.ml gdkPixbuf.mli \
gtk.ml pango.ml gtkSignal.mli gtkObject.ml \
- $(GTKPROPS:%.props=%Props.ml) \
gtkStock.ml gtkData.ml gtkBase.ml gtkPack.ml gtkButton.ml \
gtkMenu.ml gtkMisc.ml gtkWindow.ml gtkList.ml \
gtkEdit.ml gtkRange.ml gtkText.ml gtkTree.ml \
gtkFile.ml gtkMain.ml \
- gPango.ml gDraw.mli \
- gObj.mli gMain.mli gData.mli gContainer.mli gBin.mli gPack.mli gButton.mli \
- gText.mli \
- gMenu.mli gMisc.mli gTree.mli gFile.mli gList.mli gWindow.mli \
- gEdit.mli gRange.mli gAction.mli gUtil.mli gToolbox.mli gBroken.mli
+ $(GTKPROPS:%.props=%Props.ml)
ifdef USE_GLADE
DOCFILES += glade.mli xml_lexer.mli
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/ml_gobject.c new/lablgtk-2.10.1/src/ml_gobject.c
--- old/lablgtk-2.10.0/src/ml_gobject.c 2007-09-25 04:56:09.000000000 +0200
+++ new/lablgtk-2.10.1/src/ml_gobject.c 2007-11-28 06:26:18.000000000 +0100
@@ -20,7 +20,7 @@
/* */
/**************************************************************************/
-/* $Id: ml_gobject.c 1369 2007-09-25 02:56:09Z garrigue $ */
+/* $Id: ml_gobject.c 1390 2007-11-28 05:26:18Z garrigue $ */
#include
#include
#include
@@ -51,7 +51,7 @@
Make_Val_final_pointer(GObject, g_object_ref, ml_g_object_unref_later, 0)
Make_Val_final_pointer_ext (GObject, _new, Ignore, ml_g_object_unref_later, 20)
-ML_1 (G_TYPE_FROM_INSTANCE, GObject_val, Val_int)
+ML_1 (G_TYPE_FROM_INSTANCE, GObject_val, Val_GType)
// ML_1 (g_object_ref, GObject_val, Unit)
CAMLprim value ml_g_object_unref (value val)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/ml_gobject.h new/lablgtk-2.10.1/src/ml_gobject.h
--- old/lablgtk-2.10.0/src/ml_gobject.h 2007-09-25 04:56:09.000000000 +0200
+++ new/lablgtk-2.10.1/src/ml_gobject.h 2007-11-28 06:26:18.000000000 +0100
@@ -20,7 +20,7 @@
/* */
/**************************************************************************/
-/* $Id: ml_gobject.h 1369 2007-09-25 02:56:09Z garrigue $ */
+/* $Id: ml_gobject.h 1390 2007-11-28 05:26:18Z garrigue $ */
/* Defined in ml_gobject.h */
@@ -31,8 +31,8 @@
#define Val_GAnyObject_new(val) Val_GObject_new(G_OBJECT(val))
CAMLexport void ml_g_object_unref_later (GObject *);
-#define GType_val Long_val
-#define Val_GType Val_long
+#define GType_val(t) ((GType)Addr_val(t))
+#define Val_GType Val_addr
#define GClosure_val(val) ((GClosure*)Pointer_val(val))
CAMLexport value Val_GClosure (GClosure *);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lablgtk-2.10.0/src/ml_gtkmisc.c new/lablgtk-2.10.1/src/ml_gtkmisc.c
--- old/lablgtk-2.10.0/src/ml_gtkmisc.c 2007-09-26 07:43:01.000000000 +0200
+++ new/lablgtk-2.10.1/src/ml_gtkmisc.c 2007-09-26 07:33:32.000000000 +0200
@@ -20,7 +20,7 @@
/* */
/**************************************************************************/
-/* $Id: ml_gtkmisc.c 1381 2007-09-26 05:43:01Z garrigue $ */
+/* $Id: ml_gtkmisc.c 1380 2007-09-26 05:33:32Z garrigue $ */
#include
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org