OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Oct-2007 09:52:02
Branch: HEAD Handle: 2007102808520100
Modified files:
openpkg-src/ocaml-gtk ocaml-gtk.patch ocaml-gtk.spec
Log:
upgrading package: ocaml-gtk 2.6.0 -> 2.10.0
Summary:
Revision Changes Path
1.4 +18 -6 openpkg-src/ocaml-gtk/ocaml-gtk.patch
1.16 +7 -6 openpkg-src/ocaml-gtk/ocaml-gtk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ocaml-gtk/ocaml-gtk.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 ocaml-gtk.patch
--- openpkg-src/ocaml-gtk/ocaml-gtk.patch 12 Jan 2006 09:41:59 -0000
1.3
+++ openpkg-src/ocaml-gtk/ocaml-gtk.patch 28 Oct 2007 08:52:01 -0000
1.4
@@ -1,7 +1,7 @@
Index: src/Makefile
---- src/Makefile.orig 2005-10-17 13:52:03 +0200
-+++ src/Makefile 2006-01-11 21:13:29 +0100
-@@ -246,7 +246,7 @@
+--- src/Makefile.orig 2007-09-25 12:56:49 +0200
++++ src/Makefile 2007-10-28 09:44:27 +0100
+@@ -277,7 +277,7 @@
cp $(CLIBS:lib%$(XA)=dll%$(XS)) "$(DLLDIR)"
install:
@@ -11,9 +11,9 @@
cp -p *.mli "$(INSTALLDIR)"
cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) "$(INSTALLDIR)"
Index: src/ml_rsvg.c
---- src/ml_rsvg.c.orig 2005-08-18 14:45:29 +0200
-+++ src/ml_rsvg.c 2006-01-12 10:36:33 +0100
-@@ -78,13 +78,8 @@
+--- src/ml_rsvg.c.orig 2007-06-20 09:40:34 +0200
++++ src/ml_rsvg.c 2007-10-28 09:40:38 +0100
+@@ -100,13 +100,8 @@
ML_1(rsvg_handle_get_pixbuf, RsvgHandle_val, Val_GdkPixbuf_new)
@@ -27,3 +27,15 @@
CAMLprim value ml_rsvg_init (value unit)
{
+Index: config.make.in
+--- config.make.in.orig 2007-06-08 15:38:55 +0200
++++ config.make.in 2007-10-28 09:50:05 +0100
+@@ -64,7 +64,7 @@
+ GTKGLLIBS:=$(call clean_libs,$(GTKGL_LIBS))
+ GLADE_LIBS = @GLADE_LIBS@
+ GLADELIBS:=$(call clean_libs,$(GLADE_LIBS))
+-RSVG_LIBS = @RSVG_LIBS@
++RSVG_LIBS = @RSVG_LIBS@ -lbz2
+ RSVGLIBS:=$(call clean_libs,$(RSVG_LIBS))
+ GNOMECANVAS_LIBS = @GNOMECANVAS_LIBS@
+ GNOMECANVASLIBS:=$(call clean_libs,$(GNOMECANVAS_LIBS))
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ocaml-gtk/ocaml-gtk.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 ocaml-gtk.spec
--- openpkg-src/ocaml-gtk/ocaml-gtk.spec 1 Jan 2007 17:40:13 -0000
1.15
+++ openpkg-src/ocaml-gtk/ocaml-gtk.spec 28 Oct 2007 08:52:01 -0000
1.16
@@ -23,13 +23,13 @@
##
# package version
-%define V_gtk2 2.6.0
+%define V_gtk2 2.10.0
%define V_gtk1 1.2.7
# package information
Name: ocaml-gtk
Summary: Gtk/X11 Interface for OCaml
-URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
+URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
Vendor: Jacques Garrigue
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
@@ -37,7 +37,7 @@
Group: XWindow
License: LGPL
Version: %{V_gtk2}
-Release: 20061013
+Release: 20071028
# package options
%option with_gtk1 yes
@@ -60,8 +60,8 @@
PreReq: gtk
%endif
%if "%{with_gtk2}" == "yes"
-BuildPreReq: gtk2, librsvg >= 2.13.5
-PreReq: gtk2, librsvg >= 2.13.5
+BuildPreReq: gtk2, librsvg >= 2.13.5, bzip2
+PreReq: gtk2, librsvg >= 2.13.5, bzip2
%endif
AutoReq: no
AutoReqProv: no
@@ -72,7 +72,7 @@
%track
prog ocaml-gtk = {
version = %{version}
- url = http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
+ url =
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
regex = lablgtk-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
@@ -96,6 +96,7 @@
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ LIBS="-lbz2" \
./configure \
--prefix=%{l_prefix} \
--with-rsvg \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
