Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2019 03:05:38 +0900 (JST)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        x11@FreeBSD.org
Subject:   catalogue fontpath
Message-ID:  <20191226.030538.1289329960092343506.hrs@allbsd.org>

next in thread | raw e-mail | index | archive | help
----Security_Multipart0(Thu_Dec_26_03_05_38_2019_589)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Thu_Dec_26_03_05_38_2019_659)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Thu_Dec_26_03_05_38_2019_659)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

 I would like to add a "catalogue" directory as one of the default
 fontpaths for xorg-server.  A symlink in the directory is
 automatically recognized as a fontpath.

 It makes ports which install a new fontset possible to create a new
 entry there automatically.  This means that the end users do not need
 to manually configure FontPath in xorg.conf or use "xset fp".  Note
 that this affects only the legacy XLFD-based font management, not
 newer systems such as fontconfig.

 I believe this does not break backward compatibility because the
 patch will add it at the tail of the fontpath list.

-- Hiroki

----Next_Part(Thu_Dec_26_03_05_38_2019_659)--
Content-Type: Text/X-Patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="xorg-server-fontpath.20191226-1.diff"

Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile	(revision 520878)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -3,7 +3,7 @@

 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	12
+PORTREVISION?=	13
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -32,11 +32,24 @@

 .include <bsd.port.options.mk>

+FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
+FONTPATHD?=	${LOCALBASE}/etc/X11/fontpath.d
+DEFAULT_FONTPATH_LIST= \
+	${FONTPATH_ROOT}/misc/	\
+	${FONTPATH_ROOT}/TTF/ \
+	${FONTPATH_ROOT}/OTF/ \
+	${FONTPATH_ROOT}/Type1/ \
+	${FONTPATH_ROOT}/100dpi/ \
+	${FONTPATH_ROOT}/75dpi/ \
+	catalogue:${FONTPATHD}
+DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' ,
+
 USES=		gmake gl libtool perl5 ssl tar:bzip2 xorg xorg-cat:xserver
 USE_PERL5=	build
 USE_GL+=	gl
 USE_XORG+=	pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans
 CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
+		--with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \
 		--localstatedir=/var --with-shared-memory-dir=/tmp \
 		--disable-config-udev --disable-config-udev-kms \
 		--without-dtrace --enable-glamor

----Next_Part(Thu_Dec_26_03_05_38_2019_659)----

----Security_Multipart0(Thu_Dec_26_03_05_38_2019_589)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----

iMkEABMKAC4WIQRsDSNTJ8+Ax5Ae/dLbsH3Gbx9zfwUCXgOk8hAcaHJzQGZyZWVi
c2Qub3JnAAoJENuwfcZvH3N/KOUCCQFggUpVbNFZDHYTbJT9127+dzcJ5EKe0kxE
CF8t+taNMU6I0JIGAYVSozBJBgRHDtudgjXc18IwyMzVOYcCWlRyKwIHSciXDF+Y
AqwN/9KeRokFnjv8r+OOCvjLet2ha+A1z+3RIgPFlGzPDYjKg40hBNRFHp2+uRlC
xLUKXoJusIIeWBg=
=dGOl
-----END PGP SIGNATURE-----

----Security_Multipart0(Thu_Dec_26_03_05_38_2019_589)----



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191226.030538.1289329960092343506.hrs>