Thu Nov 9 10:57:57 2017 UTC ()
Added patch to x11/ocaml-lablgtk for compilation with ocaml 4.05


(jaapb)
diff -r1.30 -r1.31 pkgsrc/x11/ocaml-lablgtk/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/ocaml-lablgtk/distinfo
diff -r0 -r1.1 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_gutf8.ml
cvs diff -r1.30 -r1.31 pkgsrc/x11/ocaml-lablgtk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/Makefile 2017/11/01 09:25:36 1.30
+++ pkgsrc/x11/ocaml-lablgtk/Makefile 2017/11/09 10:57:57 1.31
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2017/11/01 09:25:36 jaapb Exp $ 1# $NetBSD: Makefile,v 1.31 2017/11/09 10:57:57 jaapb Exp $
2 2
3DISTNAME= lablgtk-2.18.6 3DISTNAME= lablgtk-2.18.6
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/1726/ 7MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/1726/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://lablgtk.forge.ocamlcore.org/ 10HOMEPAGE= http://lablgtk.forge.ocamlcore.org/
10COMMENT= GTK+ 2.x bindings for Objective Caml 11COMMENT= GTK+ 2.x bindings for Objective Caml
11# for installed files; more restrictions on applications/ 12# for installed files; more restrictions on applications/
12LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
13 14
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --enable-debug 16CONFIGURE_ARGS+= --enable-debug
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17OCAML_USE_FINDLIB= yes 18OCAML_USE_FINDLIB= yes
cvs diff -r1.10 -r1.11 pkgsrc/x11/ocaml-lablgtk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/distinfo 2017/11/01 09:25:36 1.10
+++ pkgsrc/x11/ocaml-lablgtk/distinfo 2017/11/09 10:57:57 1.11
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.10 2017/11/01 09:25:36 jaapb Exp $ 1$NetBSD: distinfo,v 1.11 2017/11/09 10:57:57 jaapb Exp $
2 2
3SHA1 (lablgtk-2.18.6.tar.gz) = 2dd099ecca246274df8f6f363c8d418ff3a67568 3SHA1 (lablgtk-2.18.6.tar.gz) = 2dd099ecca246274df8f6f363c8d418ff3a67568
4RMD160 (lablgtk-2.18.6.tar.gz) = 6fef28c6ec2757da3e0773d33c77c13abaf61895 4RMD160 (lablgtk-2.18.6.tar.gz) = 6fef28c6ec2757da3e0773d33c77c13abaf61895
5SHA512 (lablgtk-2.18.6.tar.gz) = 0d30da0e4a93b1693ac6d63161d40c8cd6d9337e105a65f3cc01b013ce7ca04aa5e1a013527cb0728a9b7b7af20d0f4c8b0cc7f9102e553dff3cf8bc83a14e5e 5SHA512 (lablgtk-2.18.6.tar.gz) = 0d30da0e4a93b1693ac6d63161d40c8cd6d9337e105a65f3cc01b013ce7ca04aa5e1a013527cb0728a9b7b7af20d0f4c8b0cc7f9102e553dff3cf8bc83a14e5e
6Size (lablgtk-2.18.6.tar.gz) = 804837 bytes 6Size (lablgtk-2.18.6.tar.gz) = 804837 bytes
7SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99 7SHA1 (patch-configure) = a559be17f6687bfb4919617c01e5c28252bf9e99
8SHA1 (patch-src_Makefile) = 5cdcc55b1b2be61bf7303c1f5fb28bb02d931aae 8SHA1 (patch-src_Makefile) = 5cdcc55b1b2be61bf7303c1f5fb28bb02d931aae
 9SHA1 (patch-src_gutf8.ml) = a813e6b7dc3944a23b4b069c9484417a592c42e8
File Added: pkgsrc/x11/ocaml-lablgtk/patches/Attic/patch-src_gutf8.ml
$NetBSD: patch-src_gutf8.ml,v 1.1 2017/11/09 10:57:57 jaapb Exp $

Patch to compile with OCaml 4.05 (remove for 4.06!)
--- src/gutf8.ml.orig	2017-10-30 08:37:29.000000000 +0000
+++ src/gutf8.ml
@@ -68,14 +68,14 @@ let write_unichar s ~pos (c : unichar) =
 let from_unichar (n : unichar) =
   let s = Bytes.create 6 and pos = ref 0 in
   write_unichar s ~pos n;
-  Bytes.sub_string s ~pos:0 ~len:!pos
+  Bytes.sub_string s 0 !pos
 
 let from_unistring (s : unistring) =
   let len = Array.length s in
   let r = Bytes.create (len*6) in
   let pos = ref 0 in
   for i = 0 to len-1 do write_unichar r ~pos s.(i) done;
-  Bytes.sub_string r ~pos:0 ~len:!pos
+  Bytes.sub_string r 0 !pos
 
 let rec hi_bits n =
   if n land 0x80 = 0 then 0 else