Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
835ac7afb1
8 changed files with 57 additions and 20 deletions
  1. +3
    -0
      package/x11/fontconfig/fontconfig.conf
  2. +6
    -0
      package/x11/fontconfig/x11-30-fontconfig-postinstall.sh
  3. +8
    -0
      package/xorg/mkfontdir/mkfontdir.conf
  4. +16
    -0
      package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh
  5. +8
    -0
      package/xorg/mkfontscale/mkfontscale.conf
  6. +16
    -0
      package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh
  7. +0
    -4
      package/xorg/xorg-server/xorg-server.conf
  8. +0
    -16
      package/xorg/xorg-server/xorg.cron

+ 3
- 0
package/x11/fontconfig/fontconfig.conf

@ -2,6 +2,9 @@ fontconfig_postmake ()
{
echo "Copying default example configs ..."
cp -fv $confdir/local.conf.data $root/etc/fonts/local.conf
echo "Installing fontconfig postinstall Script ..."
cp -fv $confdir/x11-30-fontconfig-postinstall.sh $root/etc/postinstall/
}
hook_add postmake 5 fontconfig_postmake

+ 6
- 0
package/x11/fontconfig/x11-30-fontconfig-postinstall.sh

@ -0,0 +1,6 @@
#!/bin/sh
if [ "`which fc-cache`" ] ; then
echo "Running fc-cache ..."
fc-cache -v
fi

+ 8
- 0
package/xorg/mkfontdir/mkfontdir.conf

@ -1 +1,9 @@
. "$base/package/xorg/xorg_config.sh"
mkfontdir_postmake()
{
echo "Installing mkfontdir postinstall Script ..."
cp -fv $confdir/x11-20-mkfontdir-postinstall.sh $root/etc/postinstall/
}
hook_add postmake 7 "mkfontdir_postmake"

+ 16
- 0
package/xorg/mkfontdir/x11-20-mkfontdir-postinstall.sh

@ -0,0 +1,16 @@
#!/bin/sh
# mkfontscale has to be run before mkfontdir.
print_status=1
if any_touched '/usr/X11R7/lib/X11/fonts/' ; then
for dir in /usr/X11R7/lib/X11/fonts/* ; do
[ -d $dir ] || continue
[ $print_status = 1 ] && \
{ echo "Running mkfontdir ..." ; print_status=0 ; }
echo -n "$dir "
mkfontdir $dir
done
[ $print_status = 0 ] && echo
fi
unset dir print_status

+ 8
- 0
package/xorg/mkfontscale/mkfontscale.conf

@ -1 +1,9 @@
. "$base/package/xorg/xorg_config.sh"
mkfontscale_postmake()
{
echo "Installing mkfontscale postinstall Script ..."
cp -fv $confdir/x11-10-mkfontscale-postinstall.sh $root/etc/postinstall/
}
hook_add postmake 7 "mkfontscale_postmake"

+ 16
- 0
package/xorg/mkfontscale/x11-10-mkfontscale-postinstall.sh

@ -0,0 +1,16 @@
#!/bin/sh
# mkfontscale has to be run before mkfontdir.
print_status=1
if any_touched '/usr/X11R7/lib/X11/fonts/' ; then
for dir in /usr/X11R7/lib/X11/fonts/* ; do
[ -d $dir ] || continue
[ $print_status = 1 ] && \
{ echo "Running mkfontscale ..." ; print_status=0 ; }
echo -n "$dir "
mkfontscale $dir
done
[ $print_status = 0 ] && echo
fi
unset dir print_status

+ 0
- 4
package/xorg/xorg-server/xorg-server.conf

@ -16,10 +16,6 @@ xorg_server_postmake ()
echo "Installing the xdm start script (multiplexer) ..."
cp $confdir/startxdm.sh $root/usr/X11R7/bin/startxdm
chmod +x $root/usr/X11R7/bin/startxdm
echo "Installing X-Windows Cron Script ..."
cp -fv $confdir/xorg.cron $root/etc/cron.daily/80-xorg
chmod +x $root/etc/cron.daily/80-xorg
}
hook_add preconf 5 "tar $taropt $archdir/MesaLib-$mesa_ver.tar.bz2"

+ 0
- 16
package/xorg/xorg-server/xorg.cron

@ -1,16 +0,0 @@
#!/bin/sh
echo "Running mkfontscale / mkfontdir ..."
for dir in /usr/X11R7/lib/X11/fonts/* ; do
[ -d $dir ] || continue
echo -n "$dir "
mkfontscale $dir
mkfontdir $dir
done ; unset dir
echo
if [ "`which fc-cache`" ] ; then
echo "Running fc-cache ..."
fc-cache -v
fi

Loading…
Cancel
Save