CVS commit: pkgsrc/fonts/fontconfig

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul  1 08:07:23 UTC 2026

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
        pkgsrc/fonts/fontconfig/patches: patch-src_fccompat.c

Log Message:
fontconfig: switch to upstream version of NetBSD build fix

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c

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

Modified files:

Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.138 pkgsrc/fonts/fontconfig/Makefile:1.139
--- pkgsrc/fonts/fontconfig/Makefile:1.138      Mon Jun 22 19:26:13 2026
+++ pkgsrc/fonts/fontconfig/Makefile    Wed Jul  1 08:07:23 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.138 2026/06/22 19:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2026/07/01 08:07:23 wiz Exp $
 
 DISTNAME=      fontconfig-2.18.1
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.78 pkgsrc/fonts/fontconfig/distinfo:1.79
--- pkgsrc/fonts/fontconfig/distinfo:1.78       Mon Jun 22 19:26:13 2026
+++ pkgsrc/fonts/fontconfig/distinfo    Wed Jul  1 08:07:23 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2026/06/22 19:26:13 wiz Exp $
+$NetBSD: distinfo,v 1.79 2026/07/01 08:07:23 wiz Exp $
 
 BLAKE2s (fontconfig-2.18.1.tar.xz) = b396cd1d1a5bd037e3a6d6bb05917d76b26950fea8f2d47ed6aa35bda97ef81c
 SHA512 (fontconfig-2.18.1.tar.xz) = 5d637a030625fa5b55399a2711b4dd48949429caae4b80503655bc7bd12b9a58cc278b520660845c9e93dcac4631ad5c36bf97793ac1af1b8f3131e7bd22077c
@@ -11,7 +11,7 @@ SHA1 (patch-configure) = 7926460361da8ed
 SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
-SHA1 (patch-src_fccompat.c) = 7d33ab0c3e740ae183cadb07c90920cc11caf149
+SHA1 (patch-src_fccompat.c) = bd248797a0e1fb273d5b83ede0bba6cf1785bd3d
 SHA1 (patch-src_fcftint.h) = 28086bf5f6a1d397512699d7dc61b3716c971c89
 SHA1 (patch-src_fcint.h) = 2f7062dad03431fdf820f7bc61cdd767789d2caa
 SHA1 (patch-src_fcstat.c) = bbd650ce6f6a777393acb4fa33f211c2189e1f7d

Index: pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c:1.1 pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c:1.1    Mon Jun 22 19:26:14 2026
+++ pkgsrc/fonts/fontconfig/patches/patch-src_fccompat.c        Wed Jul  1 08:07:23 2026
@@ -1,19 +1,20 @@
-$NetBSD: patch-src_fccompat.c,v 1.1 2026/06/22 19:26:14 wiz Exp $
+$NetBSD: patch-src_fccompat.c,v 1.2 2026/07/01 08:07:23 wiz Exp $
 
-NetBSD doesn't have uselocale.
+NetBSD does not provide uselocale().
 https://gitlab.freedesktop.org/fontconfig/fontconfig/-/work_items/543
 
---- src/fccompat.c.orig        2026-06-22 19:21:13.540675219 +0000
+--- src/fccompat.c.orig        2026-07-01 08:04:28.911964970 +0000
 +++ src/fccompat.c
-@@ -375,7 +375,11 @@ FcLocaleSetCurrent (FcLocale loc)
+@@ -375,7 +375,12 @@ FcLocaleSetCurrent (FcLocale loc)
  FcLocale
  FcLocaleSetCurrent (FcLocale loc)
  {
-+#ifdef __NetBSD__
++#  if HAVE_VASPRINTF_L || HAVE__VSNPRINTF_L
++    /* This function won't be used */
 +    return NULL;
-+#else
++#  else
      return uselocale (loc);
-+#endif
++#  endif
  }
  #endif