CVS commit: pkgsrc/fonts/harfbuzz

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov  1 07:21:18 UTC 2024

Modified Files:
        pkgsrc/fonts/harfbuzz: distinfo
Added Files:
        pkgsrc/fonts/harfbuzz/patches: patch-src_hb-icu.cc

Log Message:
harfbuzz-icu: fix build with icu 76 using upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/fonts/harfbuzz/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/harfbuzz/patches/patch-src_hb-icu.cc

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/distinfo
diff -u pkgsrc/fonts/harfbuzz/distinfo:1.140 pkgsrc/fonts/harfbuzz/distinfo:1.141
--- pkgsrc/fonts/harfbuzz/distinfo:1.140        Sat Oct 19 11:44:56 2024
+++ pkgsrc/fonts/harfbuzz/distinfo      Fri Nov  1 07:21:17 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.140 2024/10/19 11:44:56 wiz Exp $
+$NetBSD: distinfo,v 1.141 2024/11/01 07:21:17 wiz Exp $
 
 BLAKE2s (harfbuzz-10.0.1.tar.xz) = 62f957009ddff7ace2408c35fea5200423229bd49a4476ffa3f59df6f63d6d76
 SHA512 (harfbuzz-10.0.1.tar.xz) = 3fb7dda6e51496337698d46cebe623f678a4e5b0f006be6e1309143a82408a362c149812477e083e14811a5cba565d76eb2c0804f5e1bbea7e1bf83678176048
 Size (harfbuzz-10.0.1.tar.xz) = 17914712 bytes
+SHA1 (patch-src_hb-icu.cc) = 727a580a6c9e57492739b14effb058a8e98d43cc
 SHA1 (patch-src_meson.build) = 5b46f9933d5dea1f842fccf63eb92faae1f7c90f

Added files:

Index: pkgsrc/fonts/harfbuzz/patches/patch-src_hb-icu.cc
diff -u /dev/null pkgsrc/fonts/harfbuzz/patches/patch-src_hb-icu.cc:1.1
--- /dev/null   Fri Nov  1 07:21:18 2024
+++ pkgsrc/fonts/harfbuzz/patches/patch-src_hb-icu.cc   Fri Nov  1 07:21:17 2024
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_hb-icu.cc,v 1.1 2024/11/01 07:21:17 wiz Exp $
+
+Fix build with icu 76.1.
+https://github.com/harfbuzz/harfbuzz/commit/9974a66169c29cc2c5703ac6ad1764da2c763c66
+
+--- src/hb-icu.cc.orig 2024-09-24 16:52:43.000000000 +0000
++++ src/hb-icu.cc
+@@ -31,6 +31,11 @@
+ 
+ #ifdef HAVE_ICU
+ 
++#pragma GCC diagnostic push
++
++// https://github.com/harfbuzz/harfbuzz/issues/4915
++#pragma GCC diagnostic ignored "-Wredundant-decls"
++
+ #include "hb-icu.h"
+ 
+ #include "hb-machinery.hh"
+@@ -44,7 +49,6 @@
+ /* ICU extra semicolon, fixed since 65, https://github.com/unicode-org/icu/commit/480bec3 */
+ #if U_ICU_VERSION_MAJOR_NUM < 65 && (defined(__GNUC__) || defined(__clang__))
+ #define HB_ICU_EXTRA_SEMI_IGNORED
+-#pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wextra-semi-stmt"
+ #endif
+ 
+@@ -284,8 +288,6 @@ hb_icu_get_unicode_funcs ()
+   return static_icu_funcs.get_unconst ();
+ }
+ 
+-#ifdef HB_ICU_EXTRA_SEMI_IGNORED
+ #pragma GCC diagnostic pop
+-#endif
+ 
+ #endif