From: Matthieu Herrb Subject: Re: Actual path to html files inside fontconfig's man To: "Kirill A. Korinsky" Cc: OpenBSD tech Date: Tue, 22 Oct 2024 07:58:45 +0200 On Tue, Oct 22, 2024 at 01:52:53AM +0200, Kirill A. Korinsky wrote: > tech@, > > In the Russian-speaking telegram user group, a user with the nickname .sυλ > 89.54.17 discovered that fc-cache(1) has the wrong path. > > Here is the diff that fixes the paths for all of fontconfig's man > pages. Sorry, but no. fontconfig is externally maintained and we try to keep the number of local changes as small as possible to minimize the burden of merging upgrades. Moreover the *roff sources are generated from the sgml files. So one way to solve this is to send an upstream pull request to make the sgml file use some kind of variable expansion at build time to set the proper path for the fontconfig install prefix and use that. Then we could merge this and regenerate the roff sources on upgrades. Here an intermediate solution, give that we use our own build system, may be to patch the files as part of the respective Makefiles in /usr/xenocara/lib/fontconfig/ before installing them. I'll let you figure out how to do that. > > ok? > > Index: dist/fontconfig/fc-cache/fc-cache.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-cache/fc-cache.1,v > diff -u -p -r1.7 fc-cache.1 > --- dist/fontconfig/fc-cache/fc-cache.1 14 Nov 2022 05:41:57 -0000 1.7 > +++ dist/fontconfig/fc-cache/fc-cache.1 21 Oct 2024 23:47:33 -0000 > @@ -88,7 +88,7 @@ appropriate fonts. > \fBfc-scan\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was written by Keith Packard > Index: dist/fontconfig/fc-cat/fc-cat.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-cat/fc-cat.1,v > diff -u -p -r1.4 fc-cat.1 > --- dist/fontconfig/fc-cat/fc-cat.1 14 Nov 2022 05:41:57 -0000 1.4 > +++ dist/fontconfig/fc-cat/fc-cat.1 21 Oct 2024 23:47:33 -0000 > @@ -39,7 +39,7 @@ Show version of the program and exit. > \fBfc-scan\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was written by Patrick Lam \&. > Index: dist/fontconfig/fc-list/fc-list.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-list/fc-list.1,v > diff -u -p -r1.4 fc-list.1 > --- dist/fontconfig/fc-list/fc-list.1 14 Nov 2022 05:41:57 -0000 1.4 > +++ dist/fontconfig/fc-list/fc-list.1 21 Oct 2024 23:47:33 -0000 > @@ -69,7 +69,7 @@ fonts. > \fBfc-scan\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was written by Keith Packard > Index: dist/fontconfig/fc-match/fc-match.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-match/fc-match.1,v > diff -u -p -r1.4 fc-match.1 > --- dist/fontconfig/fc-match/fc-match.1 14 Nov 2022 05:41:57 -0000 1.4 > +++ dist/fontconfig/fc-match/fc-match.1 21 Oct 2024 23:47:33 -0000 > @@ -80,7 +80,7 @@ Display the best matching font categoriz > \fBfc-scan\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was updated by Patrick Lam \&. > Index: dist/fontconfig/fc-pattern/fc-pattern.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-pattern/fc-pattern.1,v > diff -u -p -r1.3 fc-pattern.1 > --- dist/fontconfig/fc-pattern/fc-pattern.1 14 Nov 2022 05:41:57 -0000 1.3 > +++ dist/fontconfig/fc-pattern/fc-pattern.1 21 Oct 2024 23:47:33 -0000 > @@ -61,7 +61,7 @@ is displayed for parsed pattern. > \fBfc-scan\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was updated by Behdad Esfahbod \&. > Index: dist/fontconfig/fc-query/fc-query.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-query/fc-query.1,v > diff -u -p -r1.5 fc-query.1 > --- dist/fontconfig/fc-query/fc-query.1 14 Nov 2022 05:41:57 -0000 1.5 > +++ dist/fontconfig/fc-query/fc-query.1 21 Oct 2024 23:47:33 -0000 > @@ -55,7 +55,7 @@ or 1 if any errors occurred or if at lea > \fBfc-pattern\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was updated by Behdad Esfahbod \&. > Index: dist/fontconfig/fc-scan/fc-scan.1 > =================================================================== > RCS file: /cvs/xenocara/dist/fontconfig/fc-scan/fc-scan.1,v > diff -u -p -r1.5 fc-scan.1 > --- dist/fontconfig/fc-scan/fc-scan.1 14 Nov 2022 05:41:57 -0000 1.5 > +++ dist/fontconfig/fc-scan/fc-scan.1 21 Oct 2024 23:47:33 -0000 > @@ -47,7 +47,7 @@ was found or 1 otherwise. > \fBfc-pattern\fR(1) > .PP > The fontconfig user's guide, in HTML format: > -\fI/usr/share/doc/fontconfig/fontconfig-user.html\fR\&. > +\fI/usr/X11R6/share/doc/fontconfig/fontconfig-user.html\fR\&. > .SH "AUTHOR" > .PP > This manual page was updated by Behdad Esfahbod \&. > > > -- > wbr, Kirill > -- Matthieu Herrb