summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/lablgtk/Makefile5
-rw-r--r--x11/lablgtk/distinfo13
-rw-r--r--x11/lablgtk/patches/patch-ab150
-rw-r--r--x11/lablgtk/patches/patch-ac32
-rw-r--r--x11/lablgtk/patches/patch-ad26
-rw-r--r--x11/lablgtk/patches/patch-ae36
-rw-r--r--x11/lablgtk/patches/patch-af20
7 files changed, 6 insertions, 276 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 7f98531c4fb..0c8dd59852c 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2010/09/14 11:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/09/19 15:33:10 wiz Exp $
#
-DISTNAME= lablgtk-2.14.1
-PKGREVISION= 1
+DISTNAME= lablgtk-2.14.2
CATEGORIES= x11
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo
index 0e727629327..295a8ce088a 100644
--- a/x11/lablgtk/distinfo
+++ b/x11/lablgtk/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.15 2010/08/28 16:13:25 wiz Exp $
+$NetBSD: distinfo,v 1.16 2010/09/19 15:33:10 wiz Exp $
-SHA1 (lablgtk-2.14.1.tar.gz) = d0fb6185f210c6b106c250d1a85541b7da402310
-RMD160 (lablgtk-2.14.1.tar.gz) = efa0c1446d03f4deb90656586d479d2b32e110da
-Size (lablgtk-2.14.1.tar.gz) = 777615 bytes
+SHA1 (lablgtk-2.14.2.tar.gz) = fd184418ccbc542825748ca63fba75138d2ea561
+RMD160 (lablgtk-2.14.2.tar.gz) = aa463705398eb60712187ef6a252849fb59cbff2
+Size (lablgtk-2.14.2.tar.gz) = 779803 bytes
SHA1 (patch-aa) = 193a906174c4f48c404a6b8bf045d7b6d1fe85c3
-SHA1 (patch-ab) = 99cb8e22474fef51d2ce72ed32d8c6fd01d0e7e5
-SHA1 (patch-ac) = 045fb704c746de7485f196625eafbc0eb589d194
-SHA1 (patch-ad) = 41dbe672e0981d440e73b1f27fccd9ab5cfffdc6
-SHA1 (patch-ae) = 95bce37b63ecbfbe3d09443975a20c49839c4eb5
-SHA1 (patch-af) = 2604d83fd852f9b43838e0131d47b95374e34168
diff --git a/x11/lablgtk/patches/patch-ab b/x11/lablgtk/patches/patch-ab
deleted file mode 100644
index 5cae7c45ddd..00000000000
--- a/x11/lablgtk/patches/patch-ab
+++ /dev/null
@@ -1,150 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/08/28 16:13:25 wiz Exp $
-
-From
-http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
-for building against ocaml-3.12.*.
-
---- src/gAction.mli.orig 2008-08-03 14:43:59.000000000 +0000
-+++ src/gAction.mli
-@@ -20,6 +20,9 @@
- (* *)
- (**************************************************************************)
-
-+
-+open Gobject
-+
- (** Action-based menus and toolbars *)
-
- (** {3 GtkAction} *)
-@@ -27,9 +30,9 @@
- (** @since GTK 2.4
- @gtkdoc gtk GtkAction *)
- class action_signals :
-- ([> Gtk.action ] as 'b) Gobject.obj ->
-+ ([> Gtk.action ] as 'b) obj ->
- object ('a)
-- val obj : 'b Gobject.obj
-+ val obj : 'b obj
- val after : bool
- method after : < after : 'a; .. > as 'a
- method activate : callback:(unit -> unit) -> GtkSignal.id
-@@ -38,10 +41,10 @@ class action_signals :
- (** @since GTK 2.4
- @gtkdoc gtk GtkAction *)
- class action_skel :
-- ([> Gtk.action ] as 'a) Gobject.obj ->
-+ ([> Gtk.action ] as 'a) obj ->
- object
-- val obj : 'a Gobject.obj
-- method as_action : Gtk.action Gobject.obj
-+ val obj : 'a obj
-+ method as_action : Gtk.action obj
-
- (** Properties *)
-
-@@ -88,10 +91,10 @@ class action_skel :
- (** @since GTK 2.4
- @gtkdoc gtk GtkAction *)
- class action :
-- ([> Gtk.action ] as 'a) Gobject.obj ->
-+ ([> Gtk.action ] as 'a) obj ->
- object
- inherit action_skel
-- val obj : 'a Gobject.obj
-+ val obj : 'a obj
- method connect : action_signals
- end
-
-@@ -103,20 +106,20 @@ val action : name:string -> unit -> acti
- (** @since GTK 2.4
- @gtkdoc gtk GtkToggleAction *)
- class toggle_action_signals :
-- ([> Gtk.toggle_action ] as 'b) Gobject.obj ->
-+ ([> Gtk.toggle_action ] as 'b) obj ->
- object
- inherit action_signals
-- val obj : 'b Gobject.obj
-+ val obj : 'b obj
- method toggled : callback:(unit -> unit) -> GtkSignal.id
- end
-
- (** @since GTK 2.4
- @gtkdoc gtk GtkToggleAction *)
- class toggle_action_skel :
-- ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
-+ ([> Gtk.toggle_action ] as 'a) obj ->
- object
- inherit action_skel
-- val obj : 'a Gobject.obj
-+ val obj : 'a obj
- method draw_as_radio : bool
- method get_active : bool
- method set_active : bool -> unit
-@@ -127,9 +130,10 @@ class toggle_action_skel :
- (** @since GTK 2.4
- @gtkdoc gtk GtkToggleAction *)
- class toggle_action :
-- ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
-+ ([> Gtk.toggle_action ] as 'a) obj ->
- object
- inherit toggle_action_skel
-+ val obj : 'a obj
- method connect : toggle_action_signals
- end
-
-@@ -140,10 +144,10 @@ val toggle_action : name:string -> unit
- (** @since GTK 2.4
- @gtkdoc gtk GtkRadioAction *)
- class radio_action_signals :
-- ([> Gtk.radio_action] as 'b) Gobject.obj ->
-+ ([> Gtk.radio_action] as 'b) obj ->
- object
- inherit toggle_action_signals
-- val obj : 'b Gobject.obj
-+ val obj : 'b obj
- method changed :
- callback:(int -> unit) -> GtkSignal.id
- end
-@@ -151,12 +155,12 @@ class radio_action_signals :
- (** @since GTK 2.4
- @gtkdoc gtk GtkRadioAction *)
- class radio_action :
-- ([> Gtk.radio_action] as 'a) Gobject.obj ->
-+ ([> Gtk.radio_action] as 'a) obj ->
- object
- inherit toggle_action_skel
-- val obj : 'a Gobject.obj
-+ val obj : 'a obj
- method connect : radio_action_signals
-- method as_radio_action : Gtk.radio_action Gobject.obj
-+ method as_radio_action : Gtk.radio_action obj
- method get_current_value : int
- method set_group : Gtk.radio_action Gtk.group -> unit
- method set_value : int -> unit
-@@ -172,10 +176,10 @@ val radio_action : ?group:radio_action -
- (** @since GTK 2.4
- @gtkdoc gtk GtkActionGroup *)
- class action_group_signals :
-- ([> Gtk.action_group ] as 'b) Gobject.obj ->
-+ ([> Gtk.action_group ] as 'b) obj ->
- object ('a)
- val after : bool
-- val obj : 'b Gobject.obj
-+ val obj : 'b obj
- method after : 'a
- method connect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
- method disconnect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
-@@ -186,10 +190,10 @@ class action_group_signals :
- (** @since GTK 2.4
- @gtkdoc gtk GtkActionGroup *)
- class action_group :
-- ([> Gtk.action_group ] as 'a) Gobject.obj ->
-+ ([> Gtk.action_group ] as 'a) obj ->
- object
-- val obj : 'a Gobject.obj
-- method as_group : Gtk.action_group Gobject.obj
-+ val obj : 'a obj
-+ method as_group : Gtk.action_group obj
- method connect : action_group_signals
- method sensitive : bool
- method set_sensitive : bool -> unit
diff --git a/x11/lablgtk/patches/patch-ac b/x11/lablgtk/patches/patch-ac
deleted file mode 100644
index e2660296368..00000000000
--- a/x11/lablgtk/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/08/28 16:13:25 wiz Exp $
-
-From
-http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
-for building against ocaml-3.12.*.
-
---- src/gButton.mli.orig 2008-08-03 14:43:59.000000000 +0000
-+++ src/gButton.mli
-@@ -357,9 +357,10 @@ end
- (** @gtkdoc gtk GtkToolItem
- @since GTK 2.4 *)
- class tool_item :
-- [> Gtk.tool_item] obj ->
-+ ([> Gtk.tool_item] as 'a) obj ->
- object
- inherit tool_item_skel
-+ val obj : 'a obj
- method connect : GContainer.container_signals
- end
-
-@@ -423,9 +424,10 @@ class tool_button_skel :
- (** @gtkdoc gtk GtkToolButton
- @since GTK 2.4 *)
- class tool_button :
-- [> Gtk.tool_button] obj ->
-+ ([> Gtk.tool_button] as 'a) obj ->
- object
- inherit tool_button_skel
-+ val obj : 'a obj
- method connect : tool_button_signals
- end
-
diff --git a/x11/lablgtk/patches/patch-ad b/x11/lablgtk/patches/patch-ad
deleted file mode 100644
index ec7e28a597f..00000000000
--- a/x11/lablgtk/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/08/28 16:13:25 wiz Exp $
-
-From
-http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
-for building against ocaml-3.12.*.
-
---- src/gWindow.ml.orig 2010-04-08 08:48:52.000000000 +0000
-+++ src/gWindow.ml
-@@ -171,7 +171,7 @@ class ['a] dialog_ext obj = object (self
- end
-
- class ['a] dialog obj = object (self)
-- inherit ['a] dialog_ext obj
-+ inherit ['a] dialog_ext (obj :> Gtk.dialog obj)
- method connect : 'a dialog_signals = new dialog_signals obj (self#decode)
- end
-
-@@ -193,7 +193,7 @@ let dialog ?(no_separator=false) =
- type any_response = [GtkEnums.response | `OTHER of int]
-
- class dialog_any obj = object (self)
-- inherit [any_response] dialog_base obj
-+ inherit [any_response] dialog_base (obj :> Gtk.dialog obj)
- method private encode = function
- `OTHER n -> n
- | #GtkEnums.response as v -> Dialog.std_response v
diff --git a/x11/lablgtk/patches/patch-ae b/x11/lablgtk/patches/patch-ae
deleted file mode 100644
index c60240f38c3..00000000000
--- a/x11/lablgtk/patches/patch-ae
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/08/28 16:13:25 wiz Exp $
-
-From
-http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
-for building against ocaml-3.12.*.
-
---- src/gWindow.mli.orig 2009-03-19 14:41:16.000000000 +0000
-+++ src/gWindow.mli
-@@ -191,9 +191,10 @@ class ['a] dialog_skel : ([>Gtk.dialog]
-
- (** Create popup windows
- @gtkdoc gtk GtkDialog *)
--class ['a] dialog_ext : [> Gtk.dialog] obj ->
-+class ['a] dialog_ext : ([> Gtk.dialog] as 'b) obj ->
- object
- inherit ['a] dialog_skel
-+ val obj : 'b obj
- method add_button : string -> 'a -> unit
- method add_button_stock : GtkStock.id -> 'a -> unit
- end
-@@ -203,6 +204,7 @@ class ['a] dialog_ext : [> Gtk.dialog] o
- class ['a] dialog : [> Gtk.dialog] obj ->
- object
- inherit ['a] dialog_ext
-+ val obj : Gtk.dialog obj
- method connect : 'a dialog_signals
- end
-
-@@ -236,7 +238,6 @@ val dialog :
- type any_response = [GtkEnums.response | `OTHER of int]
- class dialog_any : [> Gtk.dialog] obj -> [any_response] dialog
-
--
- (** {3 GtkMessageDialog} *)
-
- type 'a buttons
diff --git a/x11/lablgtk/patches/patch-af b/x11/lablgtk/patches/patch-af
deleted file mode 100644
index c14ff7c68e3..00000000000
--- a/x11/lablgtk/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/08/28 16:13:25 wiz Exp $
-
-From
-http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk2-20100626.tar.gz
-for building against ocaml-3.12.*.
-
---- src/gnoCanvas.mli.orig 2007-06-20 07:40:34.000000000 +0000
-+++ src/gnoCanvas.mli
-@@ -180,9 +180,10 @@ and canvas : GnomeCanvas.canvas Gtk.obj
- end
-
- (** @gtkdoc libgnomecanvas GnomeCanvasItem *)
--class ['p] item : [> GnomeCanvas.item] Gtk.obj ->
-+class ['p] item : ([> GnomeCanvas.item] as 'a) Gtk.obj ->
- object
- inherit base_item
-+ val obj : 'a Gtk.obj
- constraint 'p = [< items_properties]
- method set : 'p list -> unit
- end