Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 May 2020 14:43:41 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533550 - head/x11-servers/xwayland-devel
Message-ID:  <202005011443.041Ehfk5046316@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri May  1 14:43:41 2020
New Revision: 533550
URL: https://svnweb.freebsd.org/changeset/ports/533550

Log:
  x11-servers/xwayland-devel: don't disable default font path
  
  *.pcf fonts are rendered by X11 server but if font path is disabled
  only built-in fonts are available by default. While users could still
  amend font path via "xset fp" the discrepancy with xorg-server gave
  a bad first impression.
  
  Reported by:	jsm

Modified:
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Fri May  1 14:42:43 2020	(r533549)
+++ head/x11-servers/xwayland-devel/Makefile	Fri May  1 14:43:41 2020	(r533550)
@@ -4,6 +4,7 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	1.20.0-641
 DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
@@ -43,8 +44,20 @@ MESON_ARGS=	-Dxwayland=true \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
-		-Ddefault_font_path=${NONEXISTENT}
+		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland
+
+# Keep in sync with xorg-server
+FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
+FONTPATHD?=	${PREFIX}/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}
 
 OPTIONS_DEFINE=	NVIDIA
 



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