mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 10:07:15 +08:00
Trying to get fontconfig right. Removed the old local.conf file, enabled autohinting by default.
This commit is contained in:
parent
bce77ef3c7
commit
57f40d5f5f
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=fontconfig
|
||||
pkgver=2.8.0
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A library for configuring and customizing font access"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.fontconfig.org/release/"
|
||||
@ -35,7 +35,9 @@ build() {
|
||||
# enable Position Independent Code for prelinking
|
||||
export CFLAGS="${CFLAGS} -fPIC"
|
||||
|
||||
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var
|
||||
|
||||
make
|
||||
}
|
||||
@ -48,9 +50,13 @@ package() {
|
||||
install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \
|
||||
"${pkgdir}/etc/fonts/conf.avail"
|
||||
|
||||
# Removing the configuration files, we will symlink those in the .install hook
|
||||
rm -f "${pkgdir}/etc/fonts/conf.d"/*.conf
|
||||
|
||||
#Install license
|
||||
# Remove this configuration file, which looks like it's deprecated
|
||||
rm -f "${pkgdir}/etc/fonts/local.conf"
|
||||
|
||||
# Install license
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
configs=('20-fix-globaladvance.conf'
|
||||
configs=('10-autohint.conf'
|
||||
'20-fix-globaladvance.conf'
|
||||
'20-unhint-small-vera.conf'
|
||||
'29-replace-bitmap-fonts.conf'
|
||||
'30-metric-aliases.conf'
|
||||
@ -20,7 +21,7 @@ post_install() {
|
||||
/sbin/ldconfig -r .
|
||||
pushd /etc/fonts/conf.d > /dev/null
|
||||
for config in "${configs[@]}"; do
|
||||
ln -sf ../conf.avail/${config} .
|
||||
ln -sf "../conf.avail/${config}" .
|
||||
done
|
||||
popd > /dev/null
|
||||
/usr/bin/fc-cache -f
|
||||
@ -47,7 +48,7 @@ _EOF
|
||||
echo -n "Linking configuration files... "
|
||||
pushd /etc/fonts/conf.d > /dev/null
|
||||
for config in "${configs[@]}"; do
|
||||
ln -sf ../conf.avail/${config} .
|
||||
ln -sf "../conf.avail/${config}" .
|
||||
done
|
||||
popd > /dev/null
|
||||
echo "done."
|
||||
@ -67,8 +68,8 @@ _EOF
|
||||
# Remove dead links
|
||||
echo -n "Removing outdated configuration files... "
|
||||
for config in /etc/fonts/conf.d/*; do
|
||||
if [ ! -f ${config} ]; then
|
||||
rm -f ${config}
|
||||
if [ ! -f "${config}" ]; then
|
||||
rm -f "${config}"
|
||||
fi
|
||||
done
|
||||
echo "done."
|
||||
@ -83,8 +84,8 @@ pre_upgrade() {
|
||||
echo -n "Symlinking new configuration files... "
|
||||
pushd /etc/fonts/conf.d > /dev/null
|
||||
for config in "${configs[@]}"; do
|
||||
if [ ! -f ../conf.avail/${config} ]; then
|
||||
ln -sf ../conf.avail/${config} .
|
||||
if [ ! -f "../conf.avail/${config}" ]; then
|
||||
ln -sf "../conf.avail/${config}" .
|
||||
fi
|
||||
done
|
||||
popd > /dev/null
|
||||
@ -93,8 +94,6 @@ pre_upgrade() {
|
||||
|
||||
post_remove() {
|
||||
pushd /etc/fonts/conf.d > /dev/null
|
||||
for config in "${configs[@]}"; do
|
||||
rm -f ${config}
|
||||
done
|
||||
rm -f "${config[@]}"
|
||||
popd > /dev/null
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user