- New upstream version 2.14.2.
- Remove get/set patch, fixed upstream.
This commit is contained in:
Richard W.M. Jones
parent
026caeefd2
commit
4f7bf976e7
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
lablgtk-2.14.0.tar.gz
|
||||
/lablgtk-2.14.2.tar.gz
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
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++)
|
||||
@ -1,8 +1,8 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: ocaml-lablgtk
|
||||
Version: 2.14.0
|
||||
Release: 6%{?dist}
|
||||
Version: 2.14.2
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: Objective Caml interface to gtk+
|
||||
|
||||
@ -36,8 +36,6 @@ BuildRequires: zlib-devel
|
||||
BuildRequires: gtksourceview-devel
|
||||
BuildRequires: gtksourceview2-devel
|
||||
|
||||
Patch0: lablgtk-buildfix.patch
|
||||
|
||||
%global __ocaml_requires_opts -i GtkSourceView_types -i GtkSourceView2_types
|
||||
|
||||
|
||||
@ -73,8 +71,6 @@ 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
|
||||
|
||||
@ -157,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 5 2011 Richard W.M. Jones <rjones@redhat.com> - 2.14.2-1
|
||||
- New upstream version 2.14.2.
|
||||
- Remove get/set patch, fixed upstream.
|
||||
|
||||
* Tue Aug 24 2010 Adam Tkac <atkac redhat com> - 2.14.0-6
|
||||
- fix building against new glib (#626765)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user