CVS commit: pkgsrc/fonts/fontconfig
"Adam Ciarcinski" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc Committed By: adam Date: Fri Aug 14 14:01:21 UTC 2026 Modified Files: pkgsrc/fonts/fontconfig: Makefile distinfo Added Files: pkgsrc/fonts/fontconfig/patches: patch-conf.d_README.in Removed Files: pkgsrc/fonts/fontconfig/patches: patch-aa patch-ac patch-af patch-configure Log Message: fontconfig: since it uses meson, autoconf stuff is unnecessary, so remove it To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 pkgsrc/fonts/fontconfig/Makefile cvs rdiff -u -r1.81 -r1.82 pkgsrc/fonts/fontconfig/distinfo cvs rdiff -u -r1.19 -r0 pkgsrc/fonts/fontconfig/patches/patch-aa cvs rdiff -u -r1.17 -r0 pkgsrc/fonts/fontconfig/patches/patch-ac cvs rdiff -u -r1.3 -r0 pkgsrc/fonts/fontconfig/patches/patch-af cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in cvs rdiff -u -r1.9 -r0 pkgsrc/fonts/fontconfig/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
(unnamed)
(text/x-diff, 3.2 KB)
Modified files:
Index: pkgsrc/fonts/fontconfig/Makefile
diff -u pkgsrc/fonts/fontconfig/Makefile:1.141 pkgsrc/fonts/fontconfig/Makefile:1.142
--- pkgsrc/fonts/fontconfig/Makefile:1.141 Wed Aug 12 03:24:29 2026
+++ pkgsrc/fonts/fontconfig/Makefile Fri Aug 14 14:01:21 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2026/08/12 03:24:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.142 2026/08/14 14:01:21 adam Exp $
DISTNAME= fontconfig-2.18.3
CATEGORIES= fonts
@@ -19,7 +19,6 @@ MESON_ARGS+= -Ddefault-fonts-dirs=${PRE
MESON_ARGS+= -Dbaseconfig-dir=${PKG_SYSCONFDIR}
MESON_ARGS+= -Dcache-dir=${VARBASE}/cache/fontconfig
MESON_ARGS+= -Ddoc=disabled # docbook2man and docbook2html are required.
-CONFIGURE_ENV+= HASDOCBOOK=no
CPPFLAGS.SunOS+= -D__EXTENSIONS__
@@ -106,7 +105,7 @@ CHECK_PORTABILITY_SKIP+= .gitlab-ci/fedo
TEST_TARGET= check
pre-configure:
- -cd ${BUILDLINK_X11_DIR} && ${FIND} . -path "*fontconfig*" -type l -delete
+ cd ${BUILDLINK_X11_DIR} && ${FIND} . -path "*fontconfig*" -type l -delete
post-install:
${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf ${DESTDIR}${TMPLDIR}
Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.81 pkgsrc/fonts/fontconfig/distinfo:1.82
--- pkgsrc/fonts/fontconfig/distinfo:1.81 Wed Aug 12 03:24:29 2026
+++ pkgsrc/fonts/fontconfig/distinfo Fri Aug 14 14:01:21 2026
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.81 2026/08/12 03:24:29 ryoon Exp $
+$NetBSD: distinfo,v 1.82 2026/08/14 14:01:21 adam Exp $
BLAKE2s (fontconfig-2.18.3.tar.xz) = 1545093d46806ebda642b80dd88f8a74742e7ba7c4abc2fa5341400c61077280
SHA512 (fontconfig-2.18.3.tar.xz) = c3e769f74dc21093ada48084bddaca1ab525b1c4f04c5c11f067b69346fab153cad95de8b8238b20b02e8b9679c314bf2e0e9c4218511d8fe0f1826e4c4c6a24
Size (fontconfig-2.18.3.tar.xz) = 1172016 bytes
-SHA1 (patch-aa) = 8fec573ffd4bcc976681cae51a4ead1647e521e8
-SHA1 (patch-ac) = 3c310eb904fe2159d9bc325531942939ff927e65
-SHA1 (patch-af) = 542245860fd4f5374a8935f41a757b2ae960633d
+SHA1 (patch-conf.d_README.in) = 542245860fd4f5374a8935f41a757b2ae960633d
SHA1 (patch-conf.d_meson.build) = d4cda841bc0be5ba04fe63207bc8c3845bbad520
-SHA1 (patch-configure) = 7926460361da8edda9c1189bf72e5b31993480b6
SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc
SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
Added files:
Index: pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in
diff -u /dev/null pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1
--- /dev/null Fri Aug 14 14:01:21 2026
+++ pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in Fri Aug 14 14:01:21 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-conf.d_README.in,v 1.1 2026/08/14 14:01:21 adam Exp $
+
+--- conf.d/README.in.orig 2025-01-17 15:15:05.000000000 +0000
++++ conf.d/README.in
+@@ -2,7 +2,7 @@ conf.d/README
+
+ Each file in this directory is a fontconfig configuration file. Fontconfig
+ scans this directory, loading all files of the form [0-9][0-9]*.conf.
+-These files are normally installed in @TEMPLATEDIR@
++These files are normally installed in @PREFIX@/share/fontconfig/conf.avail
+ and then symlinked here, allowing them to be easily installed and then
+ enabled/disabled by adjusting the symlinks.
+