From 7aa205d60289a67b99f0a30a9fb342a0b18db70b Mon Sep 17 00:00:00 2001 From: "David A. Wheeler" Date: Sat, 31 Jul 2010 13:06:14 -0400 Subject: [PATCH 1/2] Add support for gtksourceview2 (in addition to gtksourceview 1.0) --- ocaml-lablgtk.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index 996b8d5..c8bcb80 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -2,7 +2,7 @@ Name: ocaml-lablgtk Version: 2.14.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective Caml interface to gtk+ @@ -34,6 +34,7 @@ BuildRequires: ocaml-lablgl-devel >= 1.03 BuildRequires: ocaml-ocamldoc BuildRequires: zlib-devel BuildRequires: gtksourceview-devel +BuildRequires: gtksourceview2-devel %global __ocaml_requires_opts -i GtkSourceView_types -i GtkSourceView2_types @@ -79,6 +80,7 @@ perl -pi -e 's|version="1.3.1"|version="%{version}"|' META %configure --with-gl --enable-debug perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile make world +make opt make doc CAMLP4O="camlp4o -I %{_libdir}/ocaml/camlp4/Camlp4Parsers" @@ -152,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 27 2010 David A. Wheeler - 2.14.0-5 +- Add support for gtksourceview2 (in addition to gtksourceview 1.0). + * Tue Jan 5 2010 Richard W.M. Jones - 2.14.0-4 - Use upstream RPM 4.8 dependency generator. - -devel package should depend on gtk2-devel, otherwise lablgtk programs From 026caeefd23e30139ab7d625a592e4441e2fdb34 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 24 Aug 2010 15:05:49 +0200 Subject: [PATCH 2/2] Fix building against new glib (#626765). Signed-off-by: Adam Tkac --- lablgtk-buildfix.patch | 83 ++++++++++++++++++++++++++++++++++++++++++ ocaml-lablgtk.spec | 8 +++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 lablgtk-buildfix.patch diff --git a/lablgtk-buildfix.patch b/lablgtk-buildfix.patch new file mode 100644 index 0000000..c33e2bb --- /dev/null +++ b/lablgtk-buildfix.patch @@ -0,0 +1,83 @@ +diff -up lablgtk-2.14.0/src/gobject.ml.buildfix lablgtk-2.14.0/src/gobject.ml +--- lablgtk-2.14.0/src/gobject.ml.buildfix 2010-08-24 14:49:03.790617791 +0200 ++++ lablgtk-2.14.0/src/gobject.ml 2010-08-24 14:50:48.051968155 +0200 +@@ -121,8 +121,8 @@ module Value = struct + external type_transformable : g_type -> g_type -> bool + = "ml_g_value_type_transformable" + external transform : g_value -> g_value -> bool = "ml_g_value_transform" +- external get : g_value -> data_get = "ml_g_value_get_variant" +- external set : g_value -> 'a data_set -> unit = "ml_g_value_set_variant" ++ external get : g_value -> data_get = "ml_value_get_variant" ++ external set : g_value -> 'a data_set -> unit = "ml_value_set_variant" + external get_pointer : g_value -> Gpointer.boxed = "ml_g_value_get_pointer" + external get_nativeint : g_value -> nativeint = "ml_g_value_get_nativeint" + external get_int32 : g_value -> int32 = "ml_g_value_get_int32" +diff -up lablgtk-2.14.0/src/ml_gobject.c.buildfix lablgtk-2.14.0/src/ml_gobject.c +--- lablgtk-2.14.0/src/ml_gobject.c.buildfix 2010-08-24 14:48:22.670085114 +0200 ++++ lablgtk-2.14.0/src/ml_gobject.c 2010-08-24 14:51:08.392231573 +0200 +@@ -289,7 +289,7 @@ CAMLprim value Val_gboxed_new(GType t, g + + #define DATA (val->data[0]) + +-static value g_value_get_variant (GValue *val) ++static value value_get_variant (GValue *val) + { + CAMLparam0(); + CAMLlocal1(tmp); +@@ -375,9 +375,9 @@ static value g_value_get_variant (GValue + CAMLreturn(ret); + } + +-ML_1 (g_value_get_variant, GValue_val, ID) ++ML_1 (value_get_variant, GValue_val, ID) + +-static void g_value_set_variant (GValue *val, value arg) ++static void value_set_variant (GValue *val, value arg) + { + value tag = Field(arg,0); + value data = Field(arg,1); +@@ -461,7 +461,7 @@ static void g_value_set_variant (GValue + return; + } + +-ML_2 (g_value_set_variant, GValue_val, ID, Unit) ++ML_2 (value_set_variant, GValue_val, ID, Unit) + + CAMLprim value ml_g_value_get_nativeint(value arg) { + GValue *val = GValue_val(arg); +@@ -532,7 +532,7 @@ CAMLprim value ml_g_object_new (value ty + pspec = g_object_class_find_property (class, param->name); + if (!pspec) failwith ("Gobject.create"); + g_value_init (¶m->value, pspec->value_type); +- g_value_set_variant (¶m->value, Field(Field(cell,0),1)); ++ value_set_variant (¶m->value, Field(Field(cell,0),1)); + param++; + } + } +@@ -556,7 +556,7 @@ CAMLprim value ml_g_object_get_property_ + if (tp == G_TYPE_INVALID) caml_invalid_argument(String_val(prop)); + g_value_init (&val, tp); + g_object_get_property (obj, String_val(prop), &val); +- ret = g_value_get_variant (&val); ++ ret = value_get_variant (&val); + g_value_unset (&val); + return ret; + } +@@ -568,7 +568,7 @@ CAMLprim value ml_g_object_set_property_ + GValue val = {0}; + if (tp == G_TYPE_INVALID) return Val_unit; /* Silently ignore this error */ + g_value_init (&val, tp); +- g_value_set_variant (&val, arg); ++ value_set_variant (&val, arg); + g_object_set_property (obj, String_val(prop), &val); + g_value_unset (&val); + return Val_unit; +@@ -611,7 +611,7 @@ CAMLprim value ml_g_signal_emit_by_name + for (i = 0; i < query.n_params; i++) { + g_value_init (&iparams[i+1], + query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE); +- g_value_set_variant (&iparams[i+1], Field(params,i)); ++ value_set_variant (&iparams[i+1], Field(params,i)); + } + g_signal_emitv (iparams, signal_id, detail, (ret ? GValue_val(ret) : 0)); + for (i = 0; i < query.n_params + 1; i++) diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index c8bcb80..7e16656 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -2,7 +2,7 @@ Name: ocaml-lablgtk Version: 2.14.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective Caml interface to gtk+ @@ -36,6 +36,7 @@ BuildRequires: zlib-devel BuildRequires: gtksourceview-devel BuildRequires: gtksourceview2-devel +Patch0: lablgtk-buildfix.patch %global __ocaml_requires_opts -i GtkSourceView_types -i GtkSourceView2_types @@ -72,6 +73,8 @@ developing applications that use %{name}. %prep %setup -q -n lablgtk-%{version} +%patch0 -p1 -b .buildfix + # version information in META file is wrong perl -pi -e 's|version="1.3.1"|version="%{version}"|' META @@ -154,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 24 2010 Adam Tkac - 2.14.0-6 +- fix building against new glib (#626765) + * Tue Jul 27 2010 David A. Wheeler - 2.14.0-5 - Add support for gtksourceview2 (in addition to gtksourceview 1.0).