Date: Friday, June 19, 2020 @ 01:00:56 Author: heftig Revision: 389520
2.13.91+48+gfcb0420-2: misc improvements Modified: fontconfig/trunk/PKGBUILD fontconfig/trunk/fontconfig.install --------------------+ PKGBUILD | 40 ++++++++++++++++++++++++++++------------ fontconfig.install | 36 +++++------------------------------- 2 files changed, 33 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-18 22:10:25 UTC (rev 389519) +++ PKGBUILD 2020-06-19 01:00:56 UTC (rev 389520) @@ -1,19 +1,18 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> # Maintainer: Jan de Groot <j...@archlinux.org> -pkgname=fontconfig +pkgbase=fontconfig +pkgname=(fontconfig fontconfig-docs) pkgver=2.13.91+48+gfcb0420 -pkgrel=1 +pkgrel=2 epoch=2 -pkgdesc="A library for configuring and customizing font access" +pkgdesc="Library for configuring and customizing font access" +url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch=(x86_64) -url="https://www.freedesktop.org/wiki/Software/fontconfig/" license=(custom) -depends=(expat freetype2) makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils docbook-sgml - perl-sgmls 'texlive-formatsextra>=2017' lynx json-c) -checkdepends=('unzip') -install=fontconfig.install + perl-sgmls 'texlive-formatsextra>=2017' lynx json-c expat freetype2) +checkdepends=(unzip) _commit=fcb042028126d79ea5a5fa015b2b034b98656e73 # master source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit" fontconfig.hook) @@ -39,7 +38,6 @@ ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-templatedir=/etc/fonts/conf.avail \ - --with-xmldir=/etc/fonts \ --localstatedir=/var \ --disable-static \ --with-default-fonts=/usr/share/fonts \ @@ -52,11 +50,29 @@ make -k check } -package() { +package_fontconfig() { + depends=(expat libfreetype.so) + provides=(libfontconfig.so) + install=fontconfig.install + backup=(etc/fonts/fonts.conf) + cd fontconfig make DESTDIR="$pkgdir" install install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING + # Split -docs + mkdir -p "$srcdir/doc/usr/share/man" + mv {"$pkgdir","$srcdir"/doc}/usr/share/doc + mv {"$pkgdir","$srcdir"/doc}/usr/share/man/man3 } + +package_fontconfig-docs() { + pkgdesc+=" (documentation)" + + mv doc/* "$pkgdir" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 fontconfig/COPYING +} + +# vim:set sw=2 et: Modified: fontconfig.install =================================================================== --- fontconfig.install 2020-06-18 22:10:25 UTC (rev 389519) +++ fontconfig.install 2020-06-19 01:00:56 UTC (rev 389520) @@ -1,38 +1,12 @@ -post_install() { - cat << _EOF - - Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d. - Read /etc/fonts/conf.d/README for more information. - - Configuration via /etc/fonts/local.conf is still possible, - but is no longer recommended for options available in conf.avail. - - Main systemwide configuration should be done by symlinks - (especially for autohinting, sub-pixel and lcdfilter): - - cd /etc/fonts/conf.d - ln -s ../conf.avail/XX-foo.conf - - Check also https://wiki.archlinux.org/index.php/Font_Configuration - and https://wiki.archlinux.org/index.php/Fonts. - -_EOF - - post_upgrade $1 -} - post_upgrade() { + # a full forced directory scan is required here echo -n "Rebuilding fontconfig cache..." - # a full forced directory scan is required here /usr/bin/fc-cache -rs echo " done." } -post_remove() { - cat << _EOF +post_install() { + post_upgrade $1 0 +} - Check for dead symlinks and leftover files - in /etc/fonts/conf.d/ - -_EOF -} +# vim:set sw=2 et: