Date: Friday, June 19, 2020 @ 01:01:45 Author: heftig Revision: 647584
2.13.91+48+gfcb0420-2: misc improvements Added: lib32-fontconfig/trunk/fontconfig-32.install (from rev 647583, lib32-fontconfig/trunk/lib32-fontconfig.install) Modified: lib32-fontconfig/trunk/PKGBUILD Deleted: lib32-fontconfig/trunk/lib32-fontconfig.install --------------------------+ PKGBUILD | 29 +++++++++++++++-------------- fontconfig-32.install | 12 ++++++++++++ lib32-fontconfig.install | 10 ---------- 3 files changed, 27 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-19 00:20:07 UTC (rev 647583) +++ PKGBUILD 2020-06-19 01:01:45 UTC (rev 647584) @@ -1,18 +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=lib32-fontconfig -pkgver=2.13.91+24+g75eadca +pkgver=2.13.91+48+gfcb0420 pkgrel=2 epoch=2 -pkgdesc="A library for configuring and customizing font access (32-bit)" +pkgdesc="Library for configuring and customizing font access (32-bit)" +url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch=(x86_64) -url="https://www.freedesktop.org/wiki/Software/fontconfig/" license=(custom) -depends=(lib32-expat lib32-freetype2 fontconfig) -makedepends=(git autoconf-archive gperf python-lxml python-six lib32-json-c) -install=lib32-fontconfig.install -_commit=75eadca26648abf69497691ff0f4c7803b9ff23c # master +makedepends=(git autoconf-archive gperf python-lxml python-six lib32-json-c + lib32-expat lib32-freetype2 fontconfig) +checkdepends=(unzip) +_commit=fcb042028126d79ea5a5fa015b2b034b98656e73 # master source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit" fontconfig-32.hook) sha256sums=('SKIP' @@ -43,7 +43,6 @@ --libdir=/usr/lib32 \ --sysconfdir=/etc \ --with-templatedir=/etc/fonts/conf.avail \ - --with-xmldir=/etc/fonts \ --localstatedir=/var \ --disable-static \ --with-default-fonts=/usr/share/fonts \ @@ -57,17 +56,19 @@ } package() { + depends=(fontconfig lib32-expat libfreetype.so) + provides=(libfontconfig.so) + install=fontconfig-32.install + cd fontconfig make DESTDIR="$pkgdir" install rm -r "$pkgdir"/{etc,usr/{include,share}} - mv "$pkgdir"/usr/bin/fc-cache{,-32} find "$pkgdir/usr/bin" -type f -not -name '*-32' -delete install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING +} - # Install license - mkdir -p "$pkgdir/usr/share/licenses" - ln -s fontconfig "$pkgdir/usr/share/licenses/$pkgname" -} +# vim:set sw=2 et: Copied: lib32-fontconfig/trunk/fontconfig-32.install (from rev 647583, lib32-fontconfig/trunk/lib32-fontconfig.install) =================================================================== --- fontconfig-32.install (rev 0) +++ fontconfig-32.install 2020-06-19 01:01:45 UTC (rev 647584) @@ -0,0 +1,12 @@ +post_upgrade() { + # a full forced directory scan is required here + echo -n "Rebuilding 32-bit fontconfig cache..." + /usr/bin/fc-cache-32 -rs + echo " done." +} + +post_install() { + post_upgrade $1 0 +} + +# vim:set sw=2 et: Deleted: lib32-fontconfig.install =================================================================== --- lib32-fontconfig.install 2020-06-19 00:20:07 UTC (rev 647583) +++ lib32-fontconfig.install 2020-06-19 01:01:45 UTC (rev 647584) @@ -1,10 +0,0 @@ -post_install() { - post_upgrade $1 -} - -post_upgrade() { - echo -n "Rebuilding 32-bit fontconfig cache..." - # a full forced directory scan is required here - /usr/bin/fc-cache-32 -rs - echo " done." -}