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

[Jan Steffens]

    Date: Monday, October 14, 2019 @ 13:38:13
  Author: heftig
Revision: 515700

2.13.91+24+g75eadca-1

Modified:
  lib32-fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-14 13:22:46 UTC (rev 515699)
+++ PKGBUILD	2019-10-14 13:38:13 UTC (rev 515700)
@@ -1,9 +1,8 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.13.91+23+g65087ac
+pkgname=lib32-fontconfig
+pkgver=2.13.91+24+g75eadca
 pkgrel=1
 epoch=2
 pkgdesc="A library for configuring and customizing font access (32-bit)"
@@ -10,11 +9,11 @@
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/fontconfig/"
 license=(custom)
-depends=(lib32-expat lib32-freetype2 $_pkgbasename)
+depends=(lib32-expat lib32-freetype2 fontconfig)
 makedepends=(git autoconf-archive gperf python-lxml python-six lib32-json-c)
 install=lib32-fontconfig.install
-_commit=65087ac7ce4cc5f2109967c1380b474955dcb590  # master
-source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit"
+_commit=75eadca26648abf69497691ff0f4c7803b9ff23c  # master
+source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit"
         fontconfig-32.hook)
 sha256sums=('SKIP'
             'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3')
@@ -24,21 +23,21 @@
 # http://getemoji.com/
 
 pkgver() {
-  cd $_pkgbasename
+  cd fontconfig
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $_pkgbasename
+  cd fontconfig
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $_pkgbasename
+  cd fontconfig
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   ./configure --prefix=/usr \
     --libdir=/usr/lib32 \
@@ -53,21 +52,22 @@
 }
 
 check() {
-  cd $_pkgbasename
+  cd fontconfig
   make -k check
 }
 
 package() {
-  cd $_pkgbasename
+  cd fontconfig
   make DESTDIR="$pkgdir" install
 
   rm -r "$pkgdir"/{etc,usr/{include,share}}
-  find "$pkgdir/usr/bin" -not -type d -not -name fc-cache -delete
+
   mv "$pkgdir"/usr/bin/fc-cache{,-32}
+  find "$pkgdir/usr/bin" -type f -not -name '*-32' -delete
 
-  install -Dm644 ../fontconfig-32.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig-32.hook"
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
 
   # Install license
   mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s fontconfig "$pkgdir/usr/share/licenses/$pkgname"
 }