head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.4
date	2007.10.28.08.52.01;	author rse;	state Exp;
branches;
next	1.3;
commitid	ETwpN0lWzMiBUkDs;

1.3
date	2006.01.12.09.41.59;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	YSp0JZFIO4E5dihr;

1.2
date	2005.10.27.18.24.13;	author rse;	state Exp;
branches;
next	1.1;
commitid	KLs4pRfGckIHzr7r;

1.1
date	2004.05.21.10.11.59;	author rse;	state Exp;
branches;
next	;

1.3.2.1
date	2006.01.12.09.41.59;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.53.28;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: ocaml-gtk 2.6.0 -> 2.10.0
@
text
@Index: src/Makefile
--- 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:
-	mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)"
+	mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)" >/dev/null 2>&1 || true
 	cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) "$(INSTALLDIR)"
 	cp -p *.mli "$(INSTALLDIR)"
 	cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) "$(INSTALLDIR)"
Index: src/ml_rsvg.c
--- 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)
 
-#if (LIBRSVG_MAJOR_VERSION == 2) && (LIBRSVG_MINOR_VERSION >= 2)
-ML_2(rsvg_handle_set_dpi, RsvgHandle_val, Double_val, Unit)
-ML_1(rsvg_set_default_dpi, Double_val, Unit)
-#else
 Unsupported(rsvg_handle_set_dpi)
 Unsupported(rsvg_set_default_dpi)
-#endif
 
 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))
@


1.3
log
@fix building against latest librsvg
@
text
@d2 3
a4 3
--- src/Makefile.orig	2005-10-17 13:52:03 +0200
+++ src/Makefile	2006-01-11 21:13:29 +0100
@@@@ -246,7 +246,7 @@@@
d14 3
a16 3
--- 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 @@@@
d30 12
@


1.3.2.1
log
@file ocaml-gtk.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:28 +0000
@
text
@d1 29
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 29
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 @@@@
 	cp $(CLIBS:lib%$(XA)=dll%$(XS)) "$(DLLDIR)"
 
 install:
-	mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)"
+	mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)" >/dev/null 2>&1 || true
 	cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) "$(INSTALLDIR)"
 	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 @@@@
 
 ML_1(rsvg_handle_get_pixbuf, RsvgHandle_val, Val_GdkPixbuf_new)
 
-#if (LIBRSVG_MAJOR_VERSION == 2) && (LIBRSVG_MINOR_VERSION >= 2)
-ML_2(rsvg_handle_set_dpi, RsvgHandle_val, Double_val, Unit)
-ML_1(rsvg_set_default_dpi, Double_val, Unit)
-#else
 Unsupported(rsvg_handle_set_dpi)
 Unsupported(rsvg_set_default_dpi)
-#endif
 
 CAMLprim value ml_rsvg_init (value unit)
 {
@


1.2
log
@upgrading package: ocaml-gtk 2.4.0 -> 2.6.0
@
text
@d3 1
a3 1
+++ src/Makefile	2005-10-27 20:16:43 +0200
d15 3
a17 2
+++ src/ml_rsvg.c	2005-10-27 20:20:55 +0200
@@@@ -79,8 +79,8 @@@@
d20 1
a20 1
 #if (LIBRSVG_MAJOR_VERSION == 2) && (LIBRSVG_MINOR_VERSION >= 2)
d23 1
a23 3
+ML_3(rsvg_handle_set_dpi, RsvgHandle_val, Double_val, Double_val, Unit)
+ML_2(rsvg_set_default_dpi, Double_val, Double_val, Unit)
 #else
d26 4
@


1.1
log
@provide both Gtk 1.x and Gtk 2.x bindings
@
text
@d2 4
a5 4
--- src/Makefile.orig	2003-10-10 08:30:46 +0200
+++ src/Makefile	2004-05-21 12:00:10 +0200
@@@@ -201,7 +201,7 @@@@
 	rm -f testcc.ml
d13 14
@