CVS commit: pkgsrc/fonts/harfbuzz

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 27 02:09:19 UTC 2024

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile.common PLIST options.mk

Log Message:
fonts/harfbuzz: Make introspection optional.

Currently this gets in the way of cross-compiling, and will continue
to do so until gobject-introspection's obstinate refusal to
cross-build is overcome.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/fonts/harfbuzz/Makefile.common
cvs rdiff -u -r1.73 -r1.74 pkgsrc/fonts/harfbuzz/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/fonts/harfbuzz/options.mk

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

Modified files:

Index: pkgsrc/fonts/harfbuzz/Makefile.common
diff -u pkgsrc/fonts/harfbuzz/Makefile.common:1.43 pkgsrc/fonts/harfbuzz/Makefile.common:1.44
--- pkgsrc/fonts/harfbuzz/Makefile.common:1.43  Wed Nov 29 11:08:51 2023
+++ pkgsrc/fonts/harfbuzz/Makefile.common       Sat Jan 27 02:09:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2023/11/29 11:08:51 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.44 2024/01/27 02:09:19 riastradh Exp $
 # used by fonts/harfbuzz-icu/Makefile
 
 DISTNAME=      harfbuzz-8.3.0
@@ -29,7 +29,6 @@ MESON_REQD+=  1.2.0
 
 # cairo/fontconfig are only needed for command line utilities
 MESON_ARGS+=   -Dcairo=disabled
-MESON_ARGS+=   -Dintrospection=enabled
 MESON_ARGS+=   -Dbenchmark=disabled
 
 PLIST_VARS+=           graphite2
@@ -78,9 +77,6 @@ REPLACE_PYTHON+=              src/*.py
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../devel/meson/build.mk"
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .if ${LIBRSVG_TYPE} == "rust"

Index: pkgsrc/fonts/harfbuzz/PLIST
diff -u pkgsrc/fonts/harfbuzz/PLIST:1.73 pkgsrc/fonts/harfbuzz/PLIST:1.74
--- pkgsrc/fonts/harfbuzz/PLIST:1.73    Thu Oct 19 15:35:15 2023
+++ pkgsrc/fonts/harfbuzz/PLIST Sat Jan 27 02:09:19 2024
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.73 2023/10/19 15:35:15 wiz Exp $
-bin/hb-info
-bin/hb-ot-shape-closure
-bin/hb-shape
-bin/hb-subset
+@comment $NetBSD: PLIST,v 1.74 2024/01/27 02:09:19 riastradh Exp $
+${PLIST.introspection}bin/hb-info
+${PLIST.introspection}bin/hb-ot-shape-closure
+${PLIST.introspection}bin/hb-shape
+${PLIST.introspection}bin/hb-subset
 include/harfbuzz/hb-aat-layout.h
 include/harfbuzz/hb-aat.h
 include/harfbuzz/hb-blob.h
@@ -16,10 +16,10 @@ include/harfbuzz/hb-face.h
 include/harfbuzz/hb-features.h
 include/harfbuzz/hb-font.h
 include/harfbuzz/hb-ft.h
-include/harfbuzz/hb-glib.h
-include/harfbuzz/hb-gobject-enums.h
-include/harfbuzz/hb-gobject-structs.h
-include/harfbuzz/hb-gobject.h
+${PLIST.introspection}include/harfbuzz/hb-glib.h
+${PLIST.introspection}include/harfbuzz/hb-gobject-enums.h
+${PLIST.introspection}include/harfbuzz/hb-gobject-structs.h
+${PLIST.introspection}include/harfbuzz/hb-gobject.h
 ${PLIST.graphite2}include/harfbuzz/hb-graphite2.h
 include/harfbuzz/hb-map.h
 include/harfbuzz/hb-ot-color.h
@@ -44,20 +44,20 @@ include/harfbuzz/hb-unicode.h
 include/harfbuzz/hb-version.h
 include/harfbuzz/hb.h
 lib/cmake/harfbuzz/harfbuzz-config.cmake
-lib/girepository-1.0/HarfBuzz-0.0.typelib
-lib/libharfbuzz-gobject.so
-lib/libharfbuzz-gobject.so.0
-lib/libharfbuzz-gobject.so.0.${SOVER}.0
+${PLIST.introspection}lib/girepository-1.0/HarfBuzz-0.0.typelib
+${PLIST.introspection}lib/libharfbuzz-gobject.so
+${PLIST.introspection}lib/libharfbuzz-gobject.so.0
+${PLIST.introspection}lib/libharfbuzz-gobject.so.0.${SOVER}.0
 lib/libharfbuzz-subset.so
 lib/libharfbuzz-subset.so.0
 lib/libharfbuzz-subset.so.0.${SOVER}.0
 lib/libharfbuzz.so
 lib/libharfbuzz.so.0
 lib/libharfbuzz.so.0.${SOVER}.0
-lib/pkgconfig/harfbuzz-gobject.pc
+${PLIST.introspection}lib/pkgconfig/harfbuzz-gobject.pc
 lib/pkgconfig/harfbuzz-subset.pc
 lib/pkgconfig/harfbuzz.pc
-share/gir-1.0/HarfBuzz-0.0.gir
+${PLIST.introspection}share/gir-1.0/HarfBuzz-0.0.gir
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.png
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.svg
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html

Index: pkgsrc/fonts/harfbuzz/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.13 pkgsrc/fonts/harfbuzz/options.mk:1.14
--- pkgsrc/fonts/harfbuzz/options.mk:1.13       Sat Jan 27 02:08:36 2024
+++ pkgsrc/fonts/harfbuzz/options.mk    Sat Jan 27 02:09:19 2024
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.13 2024/01/27 02:08:36 riastradh Exp $
+# $NetBSD: options.mk,v 1.14 2024/01/27 02:09:19 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
-PKG_SUPPORTED_OPTIONS+=        doc
-PKG_SUGGESTED_OPTIONS= doc
+PKG_SUPPORTED_OPTIONS+=        doc introspection
+PKG_SUGGESTED_OPTIONS= doc introspection
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           doc
+PLIST_VARS+=           doc introspection
 
 .if !empty(PKG_OPTIONS:Mdoc)
 MESON_ARGS+=   -Ddocs=enabled
@@ -15,3 +15,13 @@ PLIST.doc=   yes
 .else
 MESON_ARGS+=   -Ddocs=disabled
 .endif
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+MESON_ARGS+=   -Dintrospection=enabled
+.include "../../devel/glib2/buildlink3.mk"
+# XXX This should be TOOL_DEPENDS, no?
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dintrospection=disabled
+.endif