1f93fe3fca
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/xterm.git#f0bb4e3b3c0fb122d1c3a4958fee2049499a6fea
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
diff --git a/minstall.in b/minstall.in
|
|
index cd15775..a4b39a9 100644
|
|
--- a/minstall.in
|
|
+++ b/minstall.in
|
|
@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
|
|
USE_Name=${USE_chr0}${USE_chr1}
|
|
USE_NAME=`echo "$USE_name" | tr "$lower" "$upper"`
|
|
|
|
+fontpath=/usr/share/X11/fonts
|
|
+xorgcfgdir=/etc/X11
|
|
+xorgcfgfil=xorg.conf
|
|
+X_MANSECT=7
|
|
+
|
|
sed -e 's%__vendorversion__%"X Window System"%' \
|
|
-e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \
|
|
-e 's%__app_date__%'"$PATCH_YMD"% \
|
|
@@ -167,6 +172,9 @@ sed -e 's%__vendorversion__%"X Window System"%' \
|
|
-e 's%fIwtmp\\%fI'$WTMP_NAME'\\%g' \
|
|
-e "s%/etc/wtmp%$WTMP_PATH%g" \
|
|
-e 's%/\\(\*\*%/*%g' \
|
|
+ -e s%__fontpath__%$fontpath%g \
|
|
+ -e s%__xorgcfgdir__%$xorgcfgdir%g \
|
|
+ -e s%__xorgcfgfil__%$xorgcfgfil%g \
|
|
"$OLD_FILE" >$NEW_FILE
|
|
# diff -u $OLD_FILE $NEW_FILE
|
|
|
|
diff --git a/xterm.man b/xterm.man
|
|
index 14d97b8..bc76923 100644
|
|
--- a/xterm.man
|
|
+++ b/xterm.man
|
|
@@ -2512,19 +2512,18 @@ Since X11R6, bitmap fonts have been scaled.
|
|
The font server claims to provide the bold font that \fI\*n\fP requests,
|
|
but the result is not always readable.
|
|
XFree86 introduced a feature which can be used to suppress the scaling.
|
|
-In the X server's configuration file (e.g., \*(``/etc/X11/XFree86\*(''
|
|
-or \*(``/etc/X11/xorg.conf\*(''), you
|
|
+In the X server's configuration file (e.g., \*(``__xorgcfgdir__/__xorgcfgfil__\*(''), you
|
|
can add \*(``:unscaled\*('' to the end of the directory specification for the
|
|
\*(``misc\*('' fonts,
|
|
which comprise the fixed-pitch fonts that are used by \fI\*n\fP.
|
|
For example
|
|
.NS
|
|
-FontPath "/usr/lib/X11/fonts/misc/"
|
|
+FontPath "__fontpath__/misc/"
|
|
.NE
|
|
.IP
|
|
would become
|
|
.NS
|
|
-FontPath "/usr/lib/X11/fonts/misc/:unscaled"
|
|
+FontPath "__fontpath__/misc/:unscaled"
|
|
.NE
|
|
.IP
|
|
Depending on your configuration, the font server may have its own configuration
|