CVS commit: pkgsrc/graphics/ocaml-cairo

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 14 15:44:19 UTC 2024

Modified Files:
        pkgsrc/graphics/ocaml-cairo: Makefile distinfo
Added Files:
        pkgsrc/graphics/ocaml-cairo/patches: patch-src_dune

Log Message:
ocaml-cairo: hack build until it works

For some reason, dune (the build framework) as used by ocaml-cairo
doesn't find pkg-config. Provide overrides for that, leading to another
error with another override.

Untested, but at least this builds and packages again now.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/ocaml-cairo/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/ocaml-cairo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/ocaml-cairo/patches/patch-src_dune

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ocaml-cairo/Makefile
diff -u pkgsrc/graphics/ocaml-cairo/Makefile:1.29 pkgsrc/graphics/ocaml-cairo/Makefile:1.30
--- pkgsrc/graphics/ocaml-cairo/Makefile:1.29   Tue Nov 14 14:02:08 2023
+++ pkgsrc/graphics/ocaml-cairo/Makefile        Wed Feb 14 15:44:19 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2023/11/14 14:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2024/02/14 15:44:19 wiz Exp $
 
-GITHUB_PROJECT=        ocaml-cairo
 DISTNAME=      ${GITHUB_PROJECT}-0.6.4
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
+GITHUB_PROJECT=        ocaml-cairo
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/Chris00/ocaml-cairo/
@@ -17,6 +17,23 @@ OPAM_INSTALL_FILES=  ${OCAML_FINDLIB_DIRS
 DUNE_BUILD_PACKAGES=   ${OCAML_FINDLIB_DIRS}
 
 USE_TOOLS+=    pkg-config
+# ocaml-cairo doesn't find pkg-config
+# https://github.com/Chris00/ocaml-cairo/issues/35
+# seems related but has not solution
+# override detection:
+CAIRO_CFLAGS!= pkg-config --cflags cairo
+CAIRO_LIBS!=   pkg-config --libs cairo
+MAKE_ENV+=     CAIRO_CFLAGS=${CAIRO_CFLAGS:Q}
+MAKE_ENV+=     CAIRO_LIBS=${CAIRO_LIBS:Q}
+# but this isn't enough, because it leads to:
+# Error: Rule failed to generate the following targets:
+# - src/cairo_ocaml.h
+# so create this file manually and remove the existing logic
+# to avoid an error during configure (see patch-src_dune)
+#
+# TODO: enable freetype2
+pre-configure:
+       cp ${WRKSRC}/src/cairo_ocaml.h.p ${WRKSRC}/src/cairo_ocaml.h
 
 # (See options.mk.)  Upstream says that lablgtk is required, but it is
 # not.
@@ -25,5 +42,6 @@ USE_TOOLS+=   pkg-config
 .include "options.mk"
 .include "../../lang/ocaml/ocaml.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/ocaml-dune-configurator/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ocaml-cairo/distinfo
diff -u pkgsrc/graphics/ocaml-cairo/distinfo:1.6 pkgsrc/graphics/ocaml-cairo/distinfo:1.7
--- pkgsrc/graphics/ocaml-cairo/distinfo:1.6    Mon Nov 21 13:53:14 2022
+++ pkgsrc/graphics/ocaml-cairo/distinfo        Wed Feb 14 15:44:19 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2022/11/21 13:53:14 gdt Exp $
+$NetBSD: distinfo,v 1.7 2024/02/14 15:44:19 wiz Exp $
 
 BLAKE2s (ocaml-cairo-0.6.4.tar.gz) = 9c0a28c7456d859c111a530fbade625ec4883bb76201bd79d758c515c70c1c7d
 SHA512 (ocaml-cairo-0.6.4.tar.gz) = 1bf8ad724b843c8f75541b842a6c14b7e65a5901c71b77ef53df1e222777f53ec077dffeffe2ef59aa84d81616c7efead81ada8b90f8f9c0473e52999eff91c3
 Size (ocaml-cairo-0.6.4.tar.gz) = 110090 bytes
+SHA1 (patch-src_dune) = 93e936799aea148cdd127cd8b75bc7c5fdcf8301

Added files:

Index: pkgsrc/graphics/ocaml-cairo/patches/patch-src_dune
diff -u /dev/null pkgsrc/graphics/ocaml-cairo/patches/patch-src_dune:1.1
--- /dev/null   Wed Feb 14 15:44:19 2024
+++ pkgsrc/graphics/ocaml-cairo/patches/patch-src_dune  Wed Feb 14 15:44:19 2024
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_dune,v 1.1 2024/02/14 15:44:19 wiz Exp $
+
+--- src/dune.orig      2024-02-14 15:40:40.921184880 +0000
++++ src/dune
+@@ -10,6 +10,6 @@
+  (synopsis "Binding to Cairo, a 2D Vector Graphics Library"))
+ 
+ (rule
+- (targets c_flags.sexp c_library_flags.sexp cairo_ocaml.h)
++ (targets c_flags.sexp c_library_flags.sexp)
+  (deps    cairo_ocaml.h.p)
+  (action  (run ../config/discover.exe)))