Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
Re: Actual path to html files inside fontconfig's man
To:
Matthieu Herrb <matthieu@openbsd.org>
Cc:
OpenBSD tech <tech@openbsd.org>
Date:
Tue, 22 Oct 2024 15:34:59 +0200

Download raw body.

Thread
On Tue, 22 Oct 2024 07:58:45 +0200,
Matthieu Herrb <matthieu@openbsd.org> wrote:
> 
> 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.

I'll take care on prepare patch for upstream.

> 
> 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.
> 

The best that I can do is add per-Makefile hack to replace path.

Index: fc-cache/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-cache/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-cache/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-cache/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-cache
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-cat/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-cat/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-cat/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-cat/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-cat
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-list/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-list/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-list/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-list/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-list
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-match/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-match/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-match/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-match/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-match
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-pattern/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-pattern/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-pattern/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-pattern/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-pattern
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-query/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-query/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-query/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-query/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-query
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>
Index: fc-scan/Makefile
===================================================================
RCS file: /cvs/xenocara/lib/fontconfig/fc-scan/Makefile,v
diff -u -p -r1.2 Makefile
--- fc-scan/Makefile	23 Oct 2017 16:50:28 -0000	1.2
+++ fc-scan/Makefile	22 Oct 2024 13:23:48 -0000
@@ -9,5 +9,11 @@ obj:	_xenocara_obj
 
 .PATH: ${FONTCONFIG}/fc-scan
 
+${PROG}.1: ${FONTCONFIG}/${PROG}/${PROG}.1
+	@sed -e "s,/usr/share,${X11BASE}/share," \
+		${.ALLSRC} > ${.TARGET}
+
+CLEANFILES=	${PROG}.1
+
 .include <bsd.prog.mk>
 .include <bsd.xorg.mk>


-- 
wbr, Kirill