pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/fonts/fontconfig



Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 17 16:58:52 UTC 2026

Modified Files:
        pkgsrc/fonts/fontconfig: Makefile distinfo
        pkgsrc/fonts/fontconfig/patches: patch-conf.d_README.in
            patch-meson.build patch-test_test-migration.c

Log Message:
fontconfig: fix rpath in pkg-config file

This was modifying the file used by the automake build system,
but the package is using the meson one.

Remove outdated comment about gperf.

Add some comments to patches while here.

Bump PKGREVISION for pkg-config file fix.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 pkgsrc/fonts/fontconfig/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in \
    pkgsrc/fonts/fontconfig/patches/patch-meson.build
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.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.146 pkgsrc/fonts/fontconfig/Makefile:1.147
--- pkgsrc/fonts/fontconfig/Makefile:1.146      Wed Nov 11 10:36:38 2026
+++ pkgsrc/fonts/fontconfig/Makefile    Tue Nov 17 16:58:52 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.146 2026/11/11 10:36:38 nia Exp $
+# $NetBSD: Makefile,v 1.147 2026/11/17 16:58:52 wiz Exp $
 
 DISTNAME=      fontconfig-2.18.3
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    fonts
 MASTER_SITES=  https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -11,8 +11,7 @@ HOMEPAGE=     https://www.fontconfig.org/
 COMMENT=       Library for configuring and customizing font access
 #LICENSE=      x11?
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=101280
-TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf>=0:../../devel/gperf
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config msgfmt
@@ -23,7 +22,9 @@ MESON_ARGS+=          -Ddoc=disabled # docbook2m
 
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 
-PKGCONFIG_OVERRIDE=    fontconfig.pc.in
+PKGCONFIG_OVERRIDE=    output/meson-private/fontconfig.pc
+
+PKGCONFIG_OVERRIDE_STAGE=      post-configure
 
 PKG_SYSCONFSUBDIR=     fontconfig
 

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.83 pkgsrc/fonts/fontconfig/distinfo:1.84
--- pkgsrc/fonts/fontconfig/distinfo:1.83       Wed Nov 11 09:44:45 2026
+++ pkgsrc/fonts/fontconfig/distinfo    Tue Nov 17 16:58:52 2026
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.83 2026/11/11 09:44:45 nia Exp $
+$NetBSD: distinfo,v 1.84 2026/11/17 16:58:52 wiz 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-conf.d_60-latin.conf) = 1b91549d1199a2e76c4807aa25f1fd3456f10848
-SHA1 (patch-conf.d_README.in) = 542245860fd4f5374a8935f41a757b2ae960633d
+SHA1 (patch-conf.d_README.in) = 14f32bf6f2870cea0d7b4f6bbcb817105255ce09
 SHA1 (patch-conf.d_meson.build) = d4cda841bc0be5ba04fe63207bc8c3845bbad520
-SHA1 (patch-meson.build) = 12c848996a2e08aebcc89d155f36168666269dcc
+SHA1 (patch-meson.build) = 8639b6a571a545aad1cf2e09352e2d3651d5b4fc
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = a292088633030a67627cc73db501c504bc4ffd94
 SHA1 (patch-src_fcftint.h) = 28086bf5f6a1d397512699d7dc61b3716c971c89
 SHA1 (patch-src_fcint.h) = 2f7062dad03431fdf820f7bc61cdd767789d2caa
 SHA1 (patch-src_fcstat.c) = bbd650ce6f6a777393acb4fa33f211c2189e1f7d
-SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09
+SHA1 (patch-test_test-migration.c) = 11496da155a685a42d962d50e682a448358b8698

Index: pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in
diff -u pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1 pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in:1.1  Fri Aug 14 14:01:21 2026
+++ pkgsrc/fonts/fontconfig/patches/patch-conf.d_README.in      Tue Nov 17 16:58:52 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-conf.d_README.in,v 1.1 2026/08/14 14:01:21 adam Exp $
+$NetBSD: patch-conf.d_README.in,v 1.2 2026/11/17 16:58:52 wiz Exp $
+
+Adapt to pkgsrc paths.
 
 --- conf.d/README.in.orig      2025-01-17 15:15:05.000000000 +0000
 +++ conf.d/README.in
Index: pkgsrc/fonts/fontconfig/patches/patch-meson.build
diff -u pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1 pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.2
--- pkgsrc/fonts/fontconfig/patches/patch-meson.build:1.1       Sun Aug 10 13:58:35 2025
+++ pkgsrc/fonts/fontconfig/patches/patch-meson.build   Tue Nov 17 16:58:52 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-meson.build,v 1.1 2025/08/10 13:58:35 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.2 2026/11/17 16:58:52 wiz Exp $
+
+Adapt to pkgsrc paths.
 
 --- meson.build.orig   2025-04-02 14:51:30.122923578 +0000
 +++ meson.build

Index: pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c
diff -u pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.4 pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.5
--- pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c:1.4     Tue Jul 15 14:48:34 2014
+++ pkgsrc/fonts/fontconfig/patches/patch-test_test-migration.c Tue Nov 17 16:58:52 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-test_test-migration.c,v 1.4 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-test_test-migration.c,v 1.5 2026/11/17 16:58:52 wiz Exp $
+
+Fix build on SCO OpenServer 5.0.7/3.2.
 
 --- test/test-migration.c.orig 2014-01-20 08:14:21.000000000 +0000
 +++ test/test-migration.c



Home | Main Index | Thread Index | Old Index