svn commit: r533550 - head/x11-servers/xwayland-devel
Jan Beich
jbeich at FreeBSD.org
Fri May 1 14:43:42 UTC 2020
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
More information about the svn-ports-head
mailing list