> graphics/ocaml-cairo -> x11/lablgtk3, math/coq, lang/compcert
ocaml-cairo in the ports tree is 0.6.1, but already 0.6.2 is released.
(from CHANGES.md)
> 0.6.2 2020-11-23
> ----------------
>
> - Fix a memory leak (#19).
> - Fix GCC warnings, in particular the "multiple definition of ..." (#23).
> - Clarify the license.
> - Use `dune-configurator`.
though I don't yet try compiling with "-fno-common", I believe
this version fixes "-fno-common".
see
Issue #23
Variables declared without extern in cairo_ocaml.h cause FTBFS
(https://github.com/chris00/ocaml-cairo/issues/23)
here is a diff to update to 0.6.2.
I confimed just packaging on amd64.
-- yozo.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 9 Jun 2020 17:34:14 -0000 1.6
+++ Makefile 6 Feb 2021 08:46:43 -0000
@@ -5,8 +5,8 @@ CATEGORIES = graphics
GH_ACCOUNT = Chris00
GH_PROJECT = ocaml-cairo
-GH_TAGNAME = 0.6.1
-REVISION = 2
+GH_TAGNAME = 0.6.2
+## REVISION = 2
# LGPL 3.0
PERMIT_PACKAGE = Yes
@@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 c m z
+WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0 z
MODULES = lang/ocaml
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 4 Aug 2019 19:09:17 -0000 1.1.1.1
+++ distinfo 6 Feb 2021 08:46:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (ocaml-cairo-0.6.1.tar.gz) =
LUSStisx5xSnqY/PVLmKRq5fZDDrx/FiBWipooSYrRE=
-SIZE (ocaml-cairo-0.6.1.tar.gz) = 109786
+SHA256 (ocaml-cairo-0.6.2.tar.gz) =
LASXjuL2RRFj9AsLxOM0zadWXIU36fUo+DUYS0L7QS4=
+SIZE (ocaml-cairo-0.6.2.tar.gz) = 109948
Index: patches/patch-cairo2_opam
===================================================================
RCS file: patches/patch-cairo2_opam
diff -N patches/patch-cairo2_opam
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cairo2_opam 6 Feb 2021 08:46:43 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+use the old name for our dune-1.11.3p1
+
+Index: cairo2.opam
+--- cairo2.opam.orig
++++ cairo2.opam
+@@ -18,7 +18,7 @@ depends: [
+ "ocaml" {>= "4.02"}
+ "base-bigarray"
+ "dune"
+- "dune-configurator"
++ "dune.configurator"
+ "conf-cairo"
+ ]
+ depopts: [
Index: patches/patch-config_dune
===================================================================
RCS file: patches/patch-config_dune
diff -N patches/patch-config_dune
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_dune 6 Feb 2021 08:46:43 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+use the old name for our dune-1.11.3p1
+
+Index: config/dune
+--- config/dune.orig
++++ config/dune
+@@ -2,4 +2,4 @@
+ (executable
+ (name discover)
+ (modules discover)
+- (libraries dune-configurator str))
++ (libraries dune.configurator str))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 Aug 2019 19:09:17 -0000 1.1.1.1
+++ pkg/PLIST 6 Feb 2021 08:46:43 -0000
@@ -10,7 +10,7 @@ lib/ocaml/cairo2-gtk/cairo_gtk.cmti
lib/ocaml/cairo2-gtk/cairo_gtk.ml
lib/ocaml/cairo2-gtk/cairo_gtk.mli
lib/ocaml/cairo2-gtk/dune-package
-lib/ocaml/cairo2-gtk/libcairo_gtk_stubs.a
+@static-lib lib/ocaml/cairo2-gtk/libcairo_gtk_stubs.a
lib/ocaml/cairo2-gtk/opam
lib/ocaml/cairo2-pango/
lib/ocaml/cairo2-pango/META
@@ -21,7 +21,7 @@ lib/ocaml/cairo2-pango/cairo_pango.cmti
lib/ocaml/cairo2-pango/cairo_pango.ml
lib/ocaml/cairo2-pango/cairo_pango.mli
lib/ocaml/cairo2-pango/dune-package
-lib/ocaml/cairo2-pango/libcairo_pango_stubs.a
+@static-lib lib/ocaml/cairo2-pango/libcairo_pango_stubs.a
lib/ocaml/cairo2-pango/opam
lib/ocaml/cairo2/META
lib/ocaml/cairo2/cairo.cma
@@ -32,11 +32,11 @@ lib/ocaml/cairo2/cairo.ml
lib/ocaml/cairo2/cairo.mli
lib/ocaml/cairo2/cairo_ocaml.h
lib/ocaml/cairo2/dune-package
-lib/ocaml/cairo2/libcairo_stubs.a
+@static-lib lib/ocaml/cairo2/libcairo_stubs.a
lib/ocaml/cairo2/opam
-lib/ocaml/stublibs/dllcairo_gtk_stubs.so
-lib/ocaml/stublibs/dllcairo_pango_stubs.so
-lib/ocaml/stublibs/dllcairo_stubs.so
+@so lib/ocaml/stublibs/dllcairo_gtk_stubs.so
+@so lib/ocaml/stublibs/dllcairo_pango_stubs.so
+@so lib/ocaml/stublibs/dllcairo_stubs.so
share/doc/ocaml-ocaml-cairo/
share/doc/ocaml-ocaml-cairo/cairo2/
share/doc/ocaml-ocaml-cairo/cairo2-gtk/
