CVS commit: pkgsrc/fonts/harfbuzz

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May 20 10:38:37 UTC 2024

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

Log Message:
harfbuzz*: update to 8.5.0

pkgsrc: Add lots of PRINT_PLIST_AWK to simplify updates. Put coretext
file(s) into their own PLIST.

Overview of changes leading to 8.5.0
Monday, May 13, 2024
====================================
- API for partial instancing is now stable and have been promoted out of
  experimental APIs.
- Support instancing “BASE” table.
- Speedup AAT shaping by 13–30%.
- Various build fixes.
- Various subsetter and instancer fixes.

- New API
+HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS
+hb_subset_input_get_axis_range()
+hb_subset_input_pin_axis_location()


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/fonts/harfbuzz/Makefile.common
cvs rdiff -u -r1.75 -r1.76 pkgsrc/fonts/harfbuzz/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/harfbuzz/PLIST.coretext
cvs rdiff -u -r1.137 -r1.138 pkgsrc/fonts/harfbuzz/distinfo
cvs rdiff -u -r1.16 -r1.17 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.46 pkgsrc/fonts/harfbuzz/Makefile.common:1.47
--- pkgsrc/fonts/harfbuzz/Makefile.common:1.46  Fri Apr  5 11:25:22 2024
+++ pkgsrc/fonts/harfbuzz/Makefile.common       Mon May 20 10:38:37 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.46 2024/04/05 11:25:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.47 2024/05/20 10:38:37 wiz Exp $
 # used by fonts/harfbuzz-icu/Makefile
 
-DISTNAME=      harfbuzz-8.4.0
+DISTNAME=      harfbuzz-8.5.0
 CATEGORIES=    fonts
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=harfbuzz/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -31,7 +31,11 @@ MESON_REQD+= 1.2.0
 MESON_ARGS+=   -Dcairo=disabled
 MESON_ARGS+=   -Dbenchmark=disabled
 
+PLIST_SRC=             PLIST
+
 PLIST_VARS+=           graphite2
+PRINT_PLIST_AWK+=      { if (/^include\/harfbuzz\/hb-graphite2.h/) $$0 = "$${PLIST.graphite2}" $$0 }
+
 .if ${LIBRSVG_TYPE} == "rust"
 MESON_ARGS+=           -Dgraphite=enabled
 PLIST.graphite2=       yes
@@ -39,7 +43,9 @@ PLIST.graphite2=      yes
 MESON_ARGS+=           -Dgraphite=disabled
 .endif
 
-PLIST_SUBST=           SOVER=60${PKGVERSION_NOREV:S/.//g}
+SOVER=                 60${PKGVERSION_NOREV:S/.//g}
+PLIST_SUBST=           SOVER=${SOVER}
+PRINT_PLIST_AWK+=      { gsub(/${SOVER}/, "$${SOVER}"); }
 PKGCONFIG_OVERRIDE+=   output/meson-private/*.pc
 
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
@@ -52,6 +58,7 @@ LDFLAGS.OpenBSD+=     -lz
 BUILDLINK_TRANSFORM.MirBSD+=   rm:-fvisibility-inlines-hidden
 
 PLIST_VARS+=   coretext
+PRINT_PLIST_AWK+=      { if (/^include\/harfbuzz\/hb-coretext.h/) $$0 = "$${PLIST.coretext}" $$0 }
 
 .if ${OPSYS} == "Darwin"
 .  if !empty(OS_VERSION:M[0-8].*)
@@ -68,7 +75,7 @@ MESON_ARGS+=          -Dcoretext=disabled
 
 .  else
 MESON_ARGS+=           -Dcoretext=enabled
-PLIST.coretext=                yes
+PLIST_SRC+=            PLIST.coretext
 .  endif
 .endif
 

Index: pkgsrc/fonts/harfbuzz/PLIST
diff -u pkgsrc/fonts/harfbuzz/PLIST:1.75 pkgsrc/fonts/harfbuzz/PLIST:1.76
--- pkgsrc/fonts/harfbuzz/PLIST:1.75    Fri Apr  5 11:25:22 2024
+++ pkgsrc/fonts/harfbuzz/PLIST Mon May 20 10:38:37 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.75 2024/04/05 11:25:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.76 2024/05/20 10:38:37 wiz Exp $
 ${PLIST.introspection}bin/hb-info
 ${PLIST.introspection}bin/hb-ot-shape-closure
 ${PLIST.introspection}bin/hb-shape
@@ -8,7 +8,6 @@ include/harfbuzz/hb-aat.h
 include/harfbuzz/hb-blob.h
 include/harfbuzz/hb-buffer.h
 include/harfbuzz/hb-common.h
-${PLIST.coretext}include/harfbuzz/hb-coretext.h
 include/harfbuzz/hb-cplusplus.hh
 include/harfbuzz/hb-deprecated.h
 include/harfbuzz/hb-draw.h
@@ -135,6 +134,7 @@ ${PLIST.doc}share/gtk-doc/html/harfbuzz/
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-8-2-0.html
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-8-3-1.html
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-8-4-0.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-8-5-0.html
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-full.html
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html
 ${PLIST.doc}share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html

Index: pkgsrc/fonts/harfbuzz/distinfo
diff -u pkgsrc/fonts/harfbuzz/distinfo:1.137 pkgsrc/fonts/harfbuzz/distinfo:1.138
--- pkgsrc/fonts/harfbuzz/distinfo:1.137        Fri Apr  5 11:25:22 2024
+++ pkgsrc/fonts/harfbuzz/distinfo      Mon May 20 10:38:37 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.137 2024/04/05 11:25:22 wiz Exp $
+$NetBSD: distinfo,v 1.138 2024/05/20 10:38:37 wiz Exp $
 
-BLAKE2s (harfbuzz-8.4.0.tar.xz) = 81d9799fe58436b05c2a9a927261f3ce316259515d3bcc754af3a6cad1225cc7
-SHA512 (harfbuzz-8.4.0.tar.xz) = 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
-Size (harfbuzz-8.4.0.tar.xz) = 19241260 bytes
+BLAKE2s (harfbuzz-8.5.0.tar.xz) = 79434f657118fd701f5db1c47a239db1ac972d6f7a2629bdfad45d91611655ba
+SHA512 (harfbuzz-8.5.0.tar.xz) = d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c
+Size (harfbuzz-8.5.0.tar.xz) = 19468172 bytes
 SHA1 (patch-src_meson.build) = 5b46f9933d5dea1f842fccf63eb92faae1f7c90f

Index: pkgsrc/fonts/harfbuzz/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.16 pkgsrc/fonts/harfbuzz/options.mk:1.17
--- pkgsrc/fonts/harfbuzz/options.mk:1.16       Sat Apr 13 00:48:57 2024
+++ pkgsrc/fonts/harfbuzz/options.mk    Mon May 20 10:38:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2024/04/13 00:48:57 riastradh Exp $
+# $NetBSD: options.mk,v 1.17 2024/05/20 10:38:37 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+=        doc introspection
@@ -10,6 +10,7 @@ PKG_SUGGESTED_OPTIONS+=       ${${USE_CROSS_CO
 
 PLIST_VARS+=           doc introspection
 
+PRINT_PLIST_AWK+=      { if (/^share\/gtk-doc/) $$0 = "$${PLIST.doc}" $$0 }
 .if !empty(PKG_OPTIONS:Mdoc)
 MESON_ARGS+=   -Ddocs=enabled
 TOOL_DEPENDS+= gtk-doc>=1.32nb9:../../textproc/gtk-doc
@@ -18,6 +19,16 @@ PLIST.doc=   yes
 MESON_ARGS+=   -Ddocs=disabled
 .endif
 
+PRINT_PLIST_AWK+=      { if (/^bin\/hb-info/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^bin\/hb-ot-shape-closure/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^bin\/hb-shape/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^bin\/hb-subset/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^include\/harfbuzz\/hb-glib.h/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^include\/harfbuzz\/hb-gobject/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^lib\/girepository/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^lib\/libharfbuzz-gobject/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^lib\/pkgconfig\/harfbuzz-gobject.pc/) $$0 = "$${PLIST.introspection}" $$0 }
+PRINT_PLIST_AWK+=      { if (/^share\/gir-1.0/) $$0 = "$${PLIST.introspection}" $$0 }
 .if !empty(PKG_OPTIONS:Mintrospection)
 MESON_ARGS+=   -Dintrospection=enabled
 .include "../../devel/glib2/buildlink3.mk"

Added files:

Index: pkgsrc/fonts/harfbuzz/PLIST.coretext
diff -u /dev/null pkgsrc/fonts/harfbuzz/PLIST.coretext:1.1
--- /dev/null   Mon May 20 10:38:37 2024
+++ pkgsrc/fonts/harfbuzz/PLIST.coretext        Mon May 20 10:38:37 2024
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.coretext,v 1.1 2024/05/20 10:38:37 wiz Exp $
+include/harfbuzz/hb-coretext.h