From f5e72ee8d7235e5e11f0ebe73a14f9bf44b3e08b Mon Sep 17 00:00:00 2001 From: Luca Padovani Date: Mon, 6 Oct 2003 09:05:16 +0000 Subject: [PATCH] * removed spec file * updated configuration * added .props file for lablgtk2 --- helm/DEVEL/lablgtkmathview/Makefile.in | 2 +- helm/DEVEL/lablgtkmathview/configure.in | 7 +- helm/DEVEL/lablgtkmathview/gtkMathView.props | 92 +++++++++++++++++++ .../lablgtkmathview/lablgtkmathview.spec.in | 28 ------ 4 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 helm/DEVEL/lablgtkmathview/gtkMathView.props delete mode 100644 helm/DEVEL/lablgtkmathview/lablgtkmathview.spec.in diff --git a/helm/DEVEL/lablgtkmathview/Makefile.in b/helm/DEVEL/lablgtkmathview/Makefile.in index 38846e83f..e0364a774 100644 --- a/helm/DEVEL/lablgtkmathview/Makefile.in +++ b/helm/DEVEL/lablgtkmathview/Makefile.in @@ -14,7 +14,7 @@ DIST_FILES = \ Makefile.in configure.in gMathView.ml gMathView.mli \ gMathViewAux.ml gMathViewAux.mli gtkMathView.ml \ gtk_mathview.ml ml_gtk_mathview.c META.in .depend debian/ test/ \ - configure lablgtkmathview.spec lablgtkmathview.spec.in + configure gtkMathView.props DIST_DIR = $(PACKAGE)-$(VERSION) DOC_FILES = AUTHORS COPYING ChangeLog NEWS README LICENSE REQUIRES = gdome2 lablgtk2 diff --git a/helm/DEVEL/lablgtkmathview/configure.in b/helm/DEVEL/lablgtkmathview/configure.in index 971deb09a..b4ab4ff8b 100644 --- a/helm/DEVEL/lablgtkmathview/configure.in +++ b/helm/DEVEL/lablgtkmathview/configure.in @@ -3,8 +3,8 @@ AC_INIT(gMathView.ml) PACKAGE=lablgtkmathview LABLGTKMATHVIEW_MAJOR_VERSION=0 -LABLGTKMATHVIEW_MINOR_VERSION=4 -LABLGTKMATHVIEW_MICRO_VERSION=3 +LABLGTKMATHVIEW_MINOR_VERSION=5 +LABLGTKMATHVIEW_MICRO_VERSION=1 LABLGTKMATHVIEW_VERSION=$LABLGTKMATHVIEW_MAJOR_VERSION.$LABLGTKMATHVIEW_MINOR_VERSION.$LABLGTKMATHVIEW_MICRO_VERSION VERSION=$LABLGTKMATHVIEW_VERSION @@ -12,7 +12,7 @@ PKG_CHECK_MODULES(GDOME, gdome2 >= 0.7.0,, AC_MSG_ERROR(could not find Gdome2)) AC_SUBST(GDOME_CFLAGS) AC_SUBST(GDOME_LIBS) -PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview,, AC_MSG_ERROR(could not find gtkmathview)) +PKG_CHECK_MODULES(GTKMATHVIEW, gtkmathview >= 0.5.1,, AC_MSG_ERROR(could not find gtkmathview)) AC_SUBST(GTKMATHVIEW_CFLAGS) AC_SUBST(GTKMATHVIEW_LIBS) @@ -53,6 +53,5 @@ AC_SUBST(OCAML_STUB_DIR) AC_OUTPUT([ test/Makefile Makefile - lablgtkmathview.spec META ]) diff --git a/helm/DEVEL/lablgtkmathview/gtkMathView.props b/helm/DEVEL/lablgtkmathview/gtkMathView.props new file mode 100644 index 000000000..f6e837819 --- /dev/null +++ b/helm/DEVEL/lablgtkmathview/gtkMathView.props @@ -0,0 +1,92 @@ +(* $Id$ *) + +prefix "Gtk" + +header { +open Gtk +open Gtk_mathview + +external gdome_element_of_boxed_option : + Gpointer.boxed option -> TElement.t = + "ml_gtk_math_view_gdome_element_of_boxed_option" +;; + +external gdome_element_option_of_boxed_option : + Gpointer.boxed option -> TElement.t option = + "ml_gtk_math_view_gdome_element_option_of_boxed_option" +;; + +let option_element_of_option = + function + None -> None + | Some v -> Some (new Gdome.element v) +;; + +let option_element_of_boxed_option x = + option_element_of_option (gdome_element_option_of_boxed_option x) +;; + +let gdome_element_option_conv = + {Gobject.kind = `POINTER ; + Gobject.proj = + (function + `POINTER element -> option_element_of_boxed_option element + | _ -> failwith "gdome_element_option_conv") ; + Gobject.inj = + (function element -> assert false) + } +} + +oheader { + +let set_params self ~font_size ~log_verbosity = + begin + match font_size with + Some s -> self#set_font_size s + | None -> () + end ; + begin + match log_verbosity with + Some v -> self#set_log_verbosity v + | None -> () + end ; + self +;; + +let pack_return create p ?packing ?show () = + GObj.pack_return (create p) ~packing ~show +;; + +} + +conversions { + GdomeElement_option "gdome_element_option_conv" +} + +classes { + GtkAdjustment "Gtk.adjustment obj" + GtkDrawingArea "Gtk.drawing_area obj" +} + + +class MathView set wrapsig : EventBox { +(* + "width" gint : Read + "height" gint : Read + "top-x" gint : Read / Write / NoSet + "top-y" gint : Read / Write / NoSet + "hadjustment" GtkAdjustment : Read / Write / Construct + "vadjustment" GtkAdjustment : Read / Write / Construct + "buffer" GdkPixmap : Read + "drawing-area" GtkDrawingArea : Read + "font-size" guint : Read / Write / Construct + "log-verbosity" gint : Read / Write / Construct + "root-element" GdomeElement_option : Read +*) + signal click: GdomeElement_option gint + signal select_begin: GdomeElement_option gint + signal select_over: GdomeElement_option gint + signal select_end: GdomeElement_option gint + signal select_abort + signal element_over: GdomeElement_option gint +} diff --git a/helm/DEVEL/lablgtkmathview/lablgtkmathview.spec.in b/helm/DEVEL/lablgtkmathview/lablgtkmathview.spec.in deleted file mode 100644 index 8e7e6fd7b..000000000 --- a/helm/DEVEL/lablgtkmathview/lablgtkmathview.spec.in +++ /dev/null @@ -1,28 +0,0 @@ -Summary: The LablGTK binding for the GtkMathView widget -Name: @PACKAGE@ -Version: @VERSION@ -Release: 1 -Copyright: GPL -URL: http://www.cs.unibo.it/helm -Packager: Luca Padovani -Requires: gtkmathview >= 0.2.2 ocaml >= 3.00 lablgtk -Group: Applications/Publishing -Source: www.cs.unibo.it:/~lpadovan/mml-widget/@PACKAGE@-@VERSION@.tar.gz -%description -The LablGTK binding for the GtkMathView widget - -%prep -%setup - -%build -./configure -make configure - -%install -make -make opt -make install - -%files -%doc AUTHORS COPYING ChangeLog NEWS README -/usr/lib/ocaml/lablgtkmathview -- 2.39.2