diff options
| -rw-r--r-- | system/webcore-fonts/25-noautohint-corefonts.conf | 33 | ||||
| -rw-r--r-- | system/webcore-fonts/35-webcore-fonts.conf | 22 | ||||
| -rw-r--r-- | system/webcore-fonts/README | 9 | ||||
| -rw-r--r-- | system/webcore-fonts/webcore-fonts.SlackBuild | 8 | ||||
| -rw-r--r-- | system/webcore-fonts/webcore-fonts.info | 2 |
5 files changed, 5 insertions, 69 deletions
diff --git a/system/webcore-fonts/25-noautohint-corefonts.conf b/system/webcore-fonts/25-noautohint-corefonts.conf deleted file mode 100644 index 063cf4058a..0000000000 --- a/system/webcore-fonts/25-noautohint-corefonts.conf +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> - -<!-- -http://slackwiki.org/LCD_Monitor_Configuration_In_X.Org - -SlackWiki recommends using the Bytecode interpreter to render -core fonts. In this file, we disable the Freetype autohinter -for Webcore fonts only. If you've enabled the Bytecode interpreter, -it will then be used to render Webcore fonts even if you turn -the autohinter on. ---> - -<fontconfig> - <match target="font"> - <test name="family"> - <string>Andale Mono</string> - <string>Arial</string> - <string>Comic Sans MS</string> - <string>Courier New</string> - <string>Georgia</string> - <string>Impact</string> - <string>Tahoma</string> - <string>Times New Roman</string> - <string>Trebuchet MS</string> - <string>Verdana</string> - <string>Webdings</string> - </test> - <edit mode="assign" name="autohint"> - <bool>false</bool> - </edit> - </match> -</fontconfig> diff --git a/system/webcore-fonts/35-webcore-fonts.conf b/system/webcore-fonts/35-webcore-fonts.conf deleted file mode 100644 index f6c8bab9e8..0000000000 --- a/system/webcore-fonts/35-webcore-fonts.conf +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias> - <family>serif</family> - <prefer> - <family>Times New Roman</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>Arial</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>Courier New</family> - </prefer> - </alias> -</fontconfig> diff --git a/system/webcore-fonts/README b/system/webcore-fonts/README index 2d21b98a9a..3552413ff2 100644 --- a/system/webcore-fonts/README +++ b/system/webcore-fonts/README @@ -5,12 +5,7 @@ The Webcore Fonts package contains: * Microsoft's new fonts for Windows Vista * Lucida Console -This SlackBuild puts two files in in /etc/fonts/conf.avail. The first, -"35-webcore-fonts.conf", sets the "sans" "serif" and "monopace" aliases to -Arial, Times New Roman and Courier New. The second. -"25-noautohint-corefonts.conf", disables the autohinter for core fonts only. -You activate either file by symlinking it into /etc/fonts/conf.d. - Before installing these, please remove "/etc/fonts/conf.d/60-liberation.conf". That file causes Slackware to display Liberation fonts in the place of -Microsoft fonts. If you have Microsoft fonts, you don't need it. +Microsoft fonts. If you have Microsoft fonts, you don't need the +substitutions. diff --git a/system/webcore-fonts/webcore-fonts.SlackBuild b/system/webcore-fonts/webcore-fonts.SlackBuild index 5962b9abdd..c43e818151 100644 --- a/system/webcore-fonts/webcore-fonts.SlackBuild +++ b/system/webcore-fonts/webcore-fonts.SlackBuild @@ -8,7 +8,7 @@ PRGNAM=webcore-fonts VERSION=${VERSION:-3.0} ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -16,7 +16,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -35,10 +35,6 @@ mkdir -p $PKG/usr/share/fonts/TTF cp fonts/* $PKG/usr/share/fonts/TTF cp vista/* $PKG/usr/share/fonts/TTF -mkdir -p $PKG/etc/fonts/conf.avail -cp $CWD/35-webcore-fonts.conf $PKG/etc/fonts/conf.avail -cp $CWD/25-noautohint-corefonts.conf $PKG/etc/fonts/conf.avail - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION rm $PKG/usr/doc/$PRGNAM-$VERSION/index.html.new diff --git a/system/webcore-fonts/webcore-fonts.info b/system/webcore-fonts/webcore-fonts.info index 92c3e5d9a9..70eec6f57c 100644 --- a/system/webcore-fonts/webcore-fonts.info +++ b/system/webcore-fonts/webcore-fonts.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Dugan Chen" EMAIL="dugan [underscore] c [at] fastmail [dot] fm" -APPROVED="dsomero" +APPROVED="dsomero,Erik Hanson" |