[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, October 14, 2019 @ 13:39:54
  Author: heftig
Revision: 364798

2.13.91+24+g75eadca-1

Modified:
  fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-14 12:10:23 UTC (rev 364797)
+++ PKGBUILD	2019-10-14 13:39:54 UTC (rev 364798)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.13.91+23+g65087ac
+pkgver=2.13.91+24+g75eadca
 pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access"
@@ -13,7 +13,7 @@
 makedepends=(git autoconf-archive gperf python-lxml python-six docbook-utils docbook-sgml
              perl-sgmls 'texlive-formatsextra>=2017' lynx json-c)
 install=fontconfig.install
-_commit=65087ac7ce4cc5f2109967c1380b474955dcb590  # master
+_commit=75eadca26648abf69497691ff0f4c7803b9ff23c  # master
 source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit"
         fontconfig.hook)
 sha256sums=('SKIP'
@@ -24,17 +24,17 @@
 # http://getemoji.com/
 
 pkgver() {
-  cd $pkgname
+  cd fontconfig
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $pkgname
+  cd fontconfig
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
+  cd fontconfig
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-templatedir=/etc/fonts/conf.avail \
@@ -47,18 +47,15 @@
 }
 
 check() {
-  cd $pkgname
+  cd fontconfig
   make -k check
 }
 
-_install_conf() {
-  install -m644 "$1" "$pkgdir/etc/fonts/conf.avail"
-  ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d"
-}
-
 package() {
-  cd $pkgname
+  cd fontconfig
   make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  install -Dm644 ../fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
+
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 }