ocaml-cairo: enable freetype2

Bump PKGREVISION.
This commit is contained in:
wiz 2024-02-14 15:59:56 +00:00
parent a788aaaba3
commit ae37a71a7e
4 changed files with 27 additions and 7 deletions

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.31 2024/02/14 15:45:09 wiz Exp $
# $NetBSD: Makefile,v 1.32 2024/02/14 15:59:56 wiz Exp $
DISTNAME= ${GITHUB_PROJECT}-0.6.4
PKGREVISION= 9
PKGREVISION= 10
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/}
GITHUB_PROJECT= ocaml-cairo
@ -31,9 +31,9 @@ MAKE_ENV+= CAIRO_LIBS=${CAIRO_LIBS:sh:Q}
# 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
${SED} -e "s,.*#define *OCAML_CAIRO_HAS_FT .*,#define OCAML_CAIRO_HAS_FT," \
${WRKSRC}/src/cairo_ocaml.h.p > ${WRKSRC}/src/cairo_ocaml.h
# (See options.mk.) Upstream says that lablgtk is required, but it is
# not.

View File

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.7 2024/02/14 15:44:19 wiz Exp $
$NetBSD: distinfo,v 1.8 2024/02/14 15:59:56 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
SHA1 (patch-src_cairo__ocaml__types.h) = 999d53ffceafd3648f6e9b25f21be1d2a9c947f3
SHA1 (patch-src_dune) = 91f900d0ebc79b9ef7887fc7191aac62cd1dd911

View File

@ -0,0 +1,15 @@
$NetBSD: patch-src_cairo__ocaml__types.h,v 1.1 2024/02/14 15:59:56 wiz Exp $
Use standard freetype header include path.
--- src/cairo_ocaml_types.h.orig 2024-02-14 15:57:51.311904614 +0000
+++ src/cairo_ocaml_types.h
@@ -335,7 +335,7 @@ DEFINE_CUSTOM_OPERATIONS(scaled_font,
#ifdef OCAML_CAIRO_HAS_FT
#include <cairo-ft.h>
-#include <ftmodapi.h>
+#include <freetype/ftmodapi.h>
#define FT_LIBRARY_ASSIGN(v, x) \
v = ALLOC(cairo_ft_library); FT_LIBRARY_VAL(v) = x

View File

@ -1,4 +1,8 @@
$NetBSD: patch-src_dune,v 1.1 2024/02/14 15:44:19 wiz Exp $
$NetBSD: patch-src_dune,v 1.2 2024/02/14 15:59:56 wiz Exp $
Avoid double rule for cairo_ocaml.h
(other "rule" introduced by creating cairo_ocaml.h manually
in pkgsrc Makefile).
--- src/dune.orig 2024-02-14 15:40:40.921184880 +0000
+++ src/dune