CVS commit: pkgsrc/fonts/harfbuzz

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov 23 11:11:05 UTC 2023

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile.common

Log Message:
harfbuzz: Ensure glib2 is included before gtk-doc.

This works around an issue with detecting whether all required libraries are
runtime dependencies.  gtk-doc is a build-only dependency, which causes bl3
to tag glib2 and all of its dependencies as build too.  Later inclusion of
glib2 marks it as a full dependency, but include guards mean all of its
dependencies are not.  Including glib2 first is a hack, but does resolve the
problem for now.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/fonts/harfbuzz/Makefile.common

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.41 pkgsrc/fonts/harfbuzz/Makefile.common:1.42
--- pkgsrc/fonts/harfbuzz/Makefile.common:1.41  Mon Nov 13 15:32:20 2023
+++ pkgsrc/fonts/harfbuzz/Makefile.common       Thu Nov 23 11:11:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2023/11/13 15:32:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.42 2023/11/23 11:11:05 jperkin Exp $
 # used by fonts/harfbuzz-icu/Makefile
 
 DISTNAME=      harfbuzz-8.3.0
@@ -47,6 +47,9 @@ PKGCONFIG_OVERRIDE_STAGE=     pre-install
 
 LDFLAGS.OpenBSD+=      -lz
 
+# glib2 must come before gtk-doc otherwise its dependencies are only
+# registered as build dependencies, causing potential runtime failures.
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/harfbuzz/options.mk"
 
 # gcc too old
@@ -78,7 +81,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"