xorg-x11-server/bitmap_always_unscaled.diff
OBS User autobuild de140e0677 Accepting request 19080 from X11:XOrg
Copy from X11:XOrg/xorg-x11-server based on submit request 19080 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/19080
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=138
2009-08-28 18:30:20 +00:00

58 lines
2.7 KiB
Diff

From 107688407c7ebc71323dc1203ed5b92276026e1e Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Wed, 2 Apr 2008 20:09:26 +0200
Subject: [PATCH] Default bitmap fonts should typically be set as unscaled.
It is generally not desired to have bitmap fonts scale. Even so
DEFAULT_FONT_PATH had the misc, 100dpi and 75dpi paths without the
:unscaled specifier.
Now the default font path has this per default, xorgconfig and
--configure will only use these as :unscaled too.
Since SUSE has been specifying :unscaled for its bitmap fonts for
about a decade or so, and since adding the default font path to the
.conf fontpath was only introduced a year ago, this lack of scaled
bitmap fonts will not have any new side-effects.
Reported by Mike Fabian, debugged and fixed with the help of Mike
Fabian and Stefan Dirsch.
---
configure.ac | 2 +-
hw/xfree86/Makefile.am | 6 +++---
hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +---
3 files changed, 5 insertions(+), 7 deletions(-)
Index: xorg-server-1.6.3.901/configure.ac
===================================================================
--- xorg-server-1.6.3.901.orig/configure.ac
+++ xorg-server-1.6.3.901/configure.ac
@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring, AS_HELP_STR
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
[ FONTDIR="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ])
-DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
esac
Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
===================================================================
--- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
@@ -100,11 +100,11 @@ dist_options_DATA = Options
CPP_FILES_FLAGS = \
-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
- -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
+ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
- -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
- -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
+ -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
+ -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink: