rpms/lablgtk/devel lablgtk-gcc4.patch, NONE, 1.1 lablgtk.spec, 1.8, 1.9

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23809

Modified Files:
	lablgtk.spec 
Added Files:
	lablgtk-gcc4.patch 
Log Message:
- 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.


lablgtk-gcc4.patch:

--- NEW FILE lablgtk-gcc4.patch ---
--- 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);
 }
 


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lablgtk.spec	22 May 2005 22:57:27 -0000	1.8
+++ lablgtk.spec	26 May 2005 18:38:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.4.0
-Release: 4
+Release: 5
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,14 +8,18 @@
 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 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc4
 
 %build
 %configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
@@ -56,6 +61,12 @@
 %doc examples
 
 %changelog
+* Sun May 22 2005 Toshio Kuratomi <toshio-iki-lounge.com> - 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 <katzj at redhat.com> - 2.4.0-4
 - rebuild on all arches