diff --git a/lablgtk-gcc4.patch b/lablgtk-gcc4.patch new file mode 100644 index 0000000..bea68ac --- /dev/null +++ b/lablgtk-gcc4.patch @@ -0,0 +1,11 @@ +--- lablgtk-2.4.0/src/ml_panel.c.gcc4 2005-05-10 06:05:10.000000000 -0400 ++++ lablgtk-2.4.0/src/ml_panel.c 2005-05-10 06:07:36.000000000 -0400 +@@ -128,7 +128,7 @@ + static void weak_notify(gpointer data, GObject *applet) + { + value *glob_root = data; +- Pointer_val(*glob_root) = NULL; ++ Field(*glob_root, 1) = (long)NULL; + ml_global_root_destroy(glob_root); + } + diff --git a/lablgtk.spec b/lablgtk.spec index f9ff74e..ba10e4a 100644 --- a/lablgtk.spec +++ b/lablgtk.spec @@ -1,6 +1,6 @@ Name: lablgtk Version: 2.4.0 -Release: 4 +Release: 5 Summary: Objective Caml interface to gtk+ @@ -8,14 +8,18 @@ Group: System Environment/Libraries License: LGPL URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.4.0.tar.gz +Patch0: lablgtk-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ocaml >= 3.08 %{?_with_gl:Requires: lablgl >= 1.00} BuildRequires: ocaml >= 3.08, camlp4 >= 3.08 +# lablgtk can generate quite extensive documentation. +# Probably should enable this and create a subpackage for it. +#BuildRequires: ocaml-ocamldoc %{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel} -BuildRequires: gtk2-devel, libglade-devel, gdk-pixbuf-devel -BuildRequires: librsvg2-devel, libcroco-devel -BuildRequires: libbonobo-devel, bonobo-activation-devel, GConf2-devel +BuildRequires: gtk2-devel +BuildRequires: libglade2-devel +BuildRequires: librsvg2-devel BuildRequires: libgnomeui-devel, libgnomecanvas-devel, gnome-panel-devel %description @@ -28,6 +32,7 @@ gtk+. %prep %setup -q +%patch0 -p1 -b .gcc4 %build %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug @@ -56,6 +61,12 @@ rm -rf $RPM_BUILD_ROOT %doc examples %changelog +* Sun May 22 2005 Toshio Kuratomi - 2.4.0-5 +- Removed gnome-1.x BuildRequires +- Removed BuildRequires not explicitly mentioned in the configure script + (These are dragged in through dependencies.) +- Fix a gcc4 error about lvalue casting. + * Sun May 22 2005 Jeremy Katz - 2.4.0-4 - rebuild on all arches