From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Tue, 30 Aug 2011 03:38:48 +0000 (+0000)
Subject: Enlevé configuration inutile des polices dans /etc/fonts/local.conf
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=e1ab6ff650a6ac8d5f532f8e066998a966926be8;p=hvlinux.git

Enlevé configuration inutile des polices dans /etc/fonts/local.conf
---

diff --git a/stage3/pkg/fontconfig b/stage3/pkg/fontconfig
index e3ff347..d7bd771 100644
--- a/stage3/pkg/fontconfig
+++ b/stage3/pkg/fontconfig
@@ -2,11 +2,6 @@
 
 hvconfig_pre()
 {
-    if [ -z "${HV_FONTS_PATH}" ]; then
-        echo "Missing HV_FONTS_PATH environment variable"
-        exit 1
-    fi
-
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
         --localstatedir=/var \
@@ -17,26 +12,6 @@ hvconfig_pre()
 
 hvbuild_post()
 {
-    mkdir -v -p ${HV_FONTS_PATH}/{TrueType,Type1}
-    mkdir -v -p /etc/fonts
-
-    if [ -f /etc/fonts/local.conf ]; then
-        mv -v /etc/fonts/local.conf /etc/fonts/local.conf.old
-    fi
-
-    # Adding X and our local fonts directory to local configuration file
-    cat > /etc/fonts/local.conf << "EOF"
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/local.conf file for local customizations -->
-<fontconfig>
-    <dir>_HV_FONTS_PATH_/TrueType</dir>
-    <dir>_HV_FONTS_PATH_/Type1</dir>
-</fontconfig>
-EOF
-
-    sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/fonts/local.conf
-
-    # Updating cache database.
+    # Updating font information cache.
     fc-cache -f
 }
diff --git a/stage4/configure-fonts b/stage4/configure-fonts
deleted file mode 100755
index 6345568..0000000
--- a/stage4/configure-fonts
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-source ../functions/main
-
-X11_FONTS_DIR="/usr/share/fonts/X11"
-
-if ! grep -q "${X11_FONTS_DIR}" /etc/fonts/local.conf; then
-    # Adding X fonts directory to local configuration file
-    sed -i -e "s!\(</fontconfig>\)!    <dir>${X11_FONTS_DIR}</dir>\n\1!" \
-        /etc/fonts/local.conf
-fi
-
-# Updating cache database.
-fc-cache -f
-
-exit $?
diff --git a/stage4/configure-xorg b/stage4/configure-xorg
index 75b2d53..8bef873 100755
--- a/stage4/configure-xorg
+++ b/stage4/configure-xorg
@@ -156,4 +156,7 @@ EOF
 
 sed -i -e "s!_VIDEO_CARD_DRIVER_!${XORG_VIDEO_DRIVER}!g" /etc/X11/xorg.conf
 
+# Updating font information cache.
+fc-cache -f
+
 exit $?
diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index cf18df9..52478e5 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -68,7 +68,6 @@ ipkg -m acnb ${MESALIB}
 install_xorg_modules ${XORG_APP}
 ipkg_xorg ${XCURSOR_THEMES} "data"
 install_xorg_modules ${XORG_FONT}
-######################rscr once "Configuring fonts" configure-fonts
 ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
 ipkg_xorg ${LUIT} "app"
 ipkg ${PIXMAN}
diff --git a/stage5/pkg/ghostscript b/stage5/pkg/ghostscript
index ac2d5b5..6b4adaf 100644
--- a/stage5/pkg/ghostscript
+++ b/stage5/pkg/ghostscript
@@ -43,13 +43,7 @@ hvbuild_post()
     decompress_package ${GHOSTSCRIPT_FONTS_OTHER} ${GS_FONTS_PATH} 1
     chown -v -R root:root ${GS_FONTS_PATH}
     
-    if ! grep -q "${GS_FONTS_PATH}" /etc/fonts/local.conf; then
-        # Adding Ghostscript fonts directory to local configuration file
-        sed -i -e "s!\(</fontconfig>\)!    <dir>${GS_FONTS_PATH}</dir>\n\1!" \
-            /etc/fonts/local.conf
-    fi
-
-    # Updating cache database.
+    # Updating font information cache.
     fc-cache -f
 
     unset GS_FONTS_PATH