From 9099c575150a6f9c193f6843e8c40721bcef4b2f Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 27 Oct 2007 13:29:37 +0000 Subject: [PATCH] Update to 2.10.0: 2007.09.25 [Jacques] * Various preparations for release. * 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). * do not set LC_NUMERIC to C (ocaml is now ok) (Volker Grabsch). * avoid some warnings in ml_gdkpixbuf and ml_glib. 2007.08.09 [Benjamin] * GtkImage : clear support 2007.08.08 [Benjamin] * Fix typo in property "wrap-license" (was "wrap-licence") of GtkAboutDialog * Add GtkFileChooser "do-confirm-overwrite" property support and "confirm-overwrite" signal * GWindow "urgency-hint" property support 2007.08.07 [Benjamin] * Add Glib.usleep * Add Stock icons for Gtk 2.10 and 2.8 * Add has_selection and cursor_position properties in GText.buffer 2007.08.06 [Benjamin] * Add support for GtkAssistant of Gtk 2.10 2007.06.18 [Jacques] * merge patches by Julien Moutinho for GdkDisplay and gtk_tree_view_get_cell_area. 2007.06.08 [Benjamin] * Add support for gtk_link_button 2007.06.07 [Benjamin] * gtksourceview support 2007.05.27 [Benjamin] * fixed bug in GWindow.about_dialog whose callbacks raised an uncaught Not_found. The default Close button now responds `CANCEL and not `CLOSE. 2006.11.19 [Olivier] * add some missing properties in GtkIconView (in module GTree) (2.6) * add some missing properties in GtkButton (2.4, 2.6) 2006.11.03 [Olivier] * move GtkSocket code from ml_gtkbin.c to ml_gtk.c since it is wrapped in GWindow. 2006.10.27 [Jacques] * add Gdk.Cursor.get_image * remove Gdk.Cursor.destroy (could be dangerous) * add new methods to GData.clipboard (partly from SooHyoung Oh) 2006.10.13 [Jacques] * add GDraw.drawable#colormap,gc,set_gc 2006.09.15 [Olivier] * wrap GtkMenuToolButton (2.6) In lablgtk2-20060908: 2006.08.08 [RobertR] * export copy_memblock_indirected and ml_lookup_flags_getter for Windows 2006.07.06 [Jacques] * make ABSVALUE=1 to use a custom mlvalues.h where value is abstract 2006.05.13 [Jacques] * delay finalization functions when they may trigger a callback 2006.02.03 [Jacques] * add GLayout#bin_window 2005.12.19 [Jacques] * lablgladecc : apply Keita Yamaguchi's patch 2005.12.02 [Benjalin] * lablgladecc : support for GtkAboutDialog 2005.11.10 [Olivier] * wrap gtk_tree_view_expand_to_path (2.2) 2005.11.03 [Benjamin] * lablgladecc : emit w#toplevel#misc#show_all instead of w#toplevel#show in check_all, because some toplevel widgets (gMenu for example) do not have a show method 2005.10.28 [Jacques] * add windows support for rsvg --- x11/lablgtk/Makefile | 5 ++--- x11/lablgtk/PLIST | 13 ++++++++++++- x11/lablgtk/PLIST.gtksourceview | 16 ++++++++++++++++ x11/lablgtk/distinfo | 10 +++++----- x11/lablgtk/options.mk | 12 ++++++++++-- x11/lablgtk/patches/patch-aa | 15 +++------------ 6 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 x11/lablgtk/PLIST.gtksourceview diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 060f71c976fa..1a5670c92484 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2007/09/21 13:00:50 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2007/10/27 13:29:37 wiz Exp $ # -DISTNAME= lablgtk-2.6.0 -PKGREVISION= 14 +DISTNAME= lablgtk-2.10.0 CATEGORIES= x11 MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index 23487d320cf8..eda14a7a00e3 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,10 +1,14 @@ -@comment $NetBSD: PLIST,v 1.6 2007/09/21 13:00:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2007/10/27 13:29:38 wiz Exp $ bin/gdk-pixbuf-mlsource bin/lablgtk2 lib/ocaml/lablgtk2/gAction.cmi lib/ocaml/lablgtk2/gAction.cmx lib/ocaml/lablgtk2/gAction.ml lib/ocaml/lablgtk2/gAction.mli +lib/ocaml/lablgtk2/gAssistant.cmi +lib/ocaml/lablgtk2/gAssistant.cmx +lib/ocaml/lablgtk2/gAssistant.ml +lib/ocaml/lablgtk2/gAssistant.mli lib/ocaml/lablgtk2/gBin.cmi lib/ocaml/lablgtk2/gBin.cmx lib/ocaml/lablgtk2/gBin.ml @@ -68,6 +72,7 @@ lib/ocaml/lablgtk2/gRange.cmi lib/ocaml/lablgtk2/gRange.cmx lib/ocaml/lablgtk2/gRange.ml lib/ocaml/lablgtk2/gRange.mli +lib/ocaml/lablgtk2/gSourceView.mli lib/ocaml/lablgtk2/gText.cmi lib/ocaml/lablgtk2/gText.cmx lib/ocaml/lablgtk2/gText.ml @@ -132,6 +137,9 @@ lib/ocaml/lablgtk2/gpointer.mli lib/ocaml/lablgtk2/gtk.cmi lib/ocaml/lablgtk2/gtk.cmx lib/ocaml/lablgtk2/gtk.ml +lib/ocaml/lablgtk2/gtkAssistant.cmi +lib/ocaml/lablgtk2/gtkAssistant.cmx +lib/ocaml/lablgtk2/gtkAssistant.ml lib/ocaml/lablgtk2/gtkBase.cmi lib/ocaml/lablgtk2/gtkBase.cmx lib/ocaml/lablgtk2/gtkBase.ml @@ -186,6 +194,7 @@ lib/ocaml/lablgtk2/gtkSignal.cmi lib/ocaml/lablgtk2/gtkSignal.cmx lib/ocaml/lablgtk2/gtkSignal.ml lib/ocaml/lablgtk2/gtkSignal.mli +lib/ocaml/lablgtk2/gtkSourceView_types.mli lib/ocaml/lablgtk2/gtkSpell.cmi lib/ocaml/lablgtk2/gtkSpell.cmx lib/ocaml/lablgtk2/gtkSpell.ml @@ -220,12 +229,14 @@ lib/ocaml/lablgtk2/lablgtkspell.cmxa lib/ocaml/lablgtk2/lablgtktop lib/ocaml/lablgtk2/liblablgtk2.a lib/ocaml/lablgtk2/liblablgtkspell.a +lib/ocaml/lablgtk2/ml_domain.h lib/ocaml/lablgtk2/ml_gdk.h lib/ocaml/lablgtk2/ml_gdkpixbuf.h lib/ocaml/lablgtk2/ml_glib.h lib/ocaml/lablgtk2/ml_gobject.h lib/ocaml/lablgtk2/ml_gpointer.h lib/ocaml/lablgtk2/ml_gtk.h +lib/ocaml/lablgtk2/ml_gtktext.h lib/ocaml/lablgtk2/ml_gtktree.h lib/ocaml/lablgtk2/ml_gvaluecaml.h lib/ocaml/lablgtk2/ml_pango.h diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview new file mode 100644 index 000000000000..ed5621df5a20 --- /dev/null +++ b/x11/lablgtk/PLIST.gtksourceview @@ -0,0 +1,16 @@ +@comment $NetBSD: PLIST.gtksourceview,v 1.1 2007/10/27 13:29:38 wiz Exp $ +lib/ocaml/lablgtk2/gSourceView.cmi +lib/ocaml/lablgtk2/gSourceView.cmx +lib/ocaml/lablgtk2/gSourceView.ml +lib/ocaml/lablgtk2/gtkSourceView.cmi +lib/ocaml/lablgtk2/gtkSourceView.cmx +lib/ocaml/lablgtk2/gtkSourceView.ml +lib/ocaml/lablgtk2/lablgtksourceview.a +lib/ocaml/lablgtk2/lablgtksourceview.cma +lib/ocaml/lablgtk2/lablgtksourceview.cmxa +lib/ocaml/lablgtk2/liblablgtksourceview.a +lib/ocaml/lablgtk2/sourceViewEnums.cmi +lib/ocaml/lablgtk2/sourceViewEnums.cmx +lib/ocaml/lablgtk2/sourceViewEnums.ml +lib/ocaml/lablgtk2/sourceView_tags.h +${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtksourceview.so diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo index 4ad19864c7fa..631f829a15ad 100644 --- a/x11/lablgtk/distinfo +++ b/x11/lablgtk/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2007/09/21 13:00:53 wiz Exp $ +$NetBSD: distinfo,v 1.11 2007/10/27 13:29:38 wiz Exp $ -SHA1 (lablgtk-2.6.0.tar.gz) = 99aecd26360c5ba8f0d17fb0cdae42ff083732ce -RMD160 (lablgtk-2.6.0.tar.gz) = cc3bf61170f69bc43e5420bdd28e111744200384 -Size (lablgtk-2.6.0.tar.gz) = 658095 bytes -SHA1 (patch-aa) = a07ea3442cf4ded605c14da56527568209c234ff +SHA1 (lablgtk-2.10.0.tar.gz) = 47cca75028a7a03dbcd3f22c1b73519e0e22384e +RMD160 (lablgtk-2.10.0.tar.gz) = c149acc683c43b846347aeb3454966fd6ce1cce8 +Size (lablgtk-2.10.0.tar.gz) = 742009 bytes +SHA1 (patch-aa) = 613dc2ffbc245b0593df8c500673e19ed1de1554 diff --git a/x11/lablgtk/options.mk b/x11/lablgtk/options.mk index 90bae4558dab..700f1801590c 100644 --- a/x11/lablgtk/options.mk +++ b/x11/lablgtk/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2007/10/04 12:06:40 obache Exp $ +# $NetBSD: options.mk,v 1.3 2007/10/27 13:29:38 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lablgtk -PKG_SUPPORTED_OPTIONS= glade gnomecanvas svg +PKG_SUPPORTED_OPTIONS= glade gnomecanvas gtksourceview svg PKG_SUGGESTED_OPTIONS= gnomecanvas svg .include "../../mk/bsd.options.mk" @@ -24,6 +24,14 @@ PLIST_SRC+= PLIST.gnomecanvas CONFIGURE_ARGS+= --without-gnomecanvas .endif +.if !empty(PKG_OPTIONS:Mgtksourceview) +.include "../../x11/gtksourceview/buildlink3.mk" +CONFIGURE_ARGS+= --with-gtksourceview +PLIST_SRC+= PLIST.gtksourceview +.else +CONFIGURE_ARGS+= --without-gtksourceview +.endif + .if !empty(PKG_OPTIONS:Msvg) .include "../../graphics/librsvg/buildlink3.mk" CONFIGURE_ARGS+= --with-rsvg diff --git a/x11/lablgtk/patches/patch-aa b/x11/lablgtk/patches/patch-aa index 95353e7d2760..550d608a1381 100644 --- a/x11/lablgtk/patches/patch-aa +++ b/x11/lablgtk/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2007/09/21 13:00:54 wiz Exp $ +$NetBSD: patch-aa,v 1.7 2007/10/27 13:29:38 wiz Exp $ ---- src/Makefile.orig 2005-10-17 13:52:03.000000000 +0200 +--- src/Makefile.orig 2007-09-25 10:56:49.000000000 +0000 +++ src/Makefile -@@ -220,7 +220,7 @@ build.ml: Makefile $(CONFIG) build.ml.in - -e "s|@GTKLIBS@|$(GTKLIBS)|" < build.ml.in > $@ - - gdk-pixbuf-mlsource$(XE) : lablgtk.cma gtkInit.cmo gdk-pixbuf-mlsource.ml -- $(CAMLC) -o $@ $^ -+ $(CAMLC) -I . -o $@ $^ - - lablgtkopt:: $(MLLIBS:.cma=.cmxa) $(INITOBJS:.cmo=.cmx) - ifeq ($(THREADS_LIB),system) -@@ -254,9 +254,7 @@ install: +@@ -285,9 +285,7 @@ install: cp $(CLIBS) "$(INSTALLDIR)" cd "$(INSTALLDIR)" && $(RANLIB) $(CLIBS) cp varcc$(XE) propcc$(XE) "$(INSTALLDIR)"