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

[Maxime Gauduin]

    Date: Tuesday, March 23, 2021 @ 09:58:01
  Author: alucryd
Revision: 900213

upgpkg: lib32-fontconfig 2:2.13.93-1

Modified:
  lib32-fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   94 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-23 09:30:28 UTC (rev 900212)
+++ PKGBUILD	2021-03-23 09:58:01 UTC (rev 900213)
@@ -1,74 +1,72 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-fontconfig
-pkgver=2.13.91+48+gfcb0420
-pkgrel=2
+pkgver=2.13.93
+pkgrel=1
 epoch=2
-pkgdesc="Library for configuring and customizing font access (32-bit)"
-url="https://www.freedesktop.org/wiki/Software/fontconfig/"
+pkgdesc='Library for configuring and customizing font access'
+url=https://www.freedesktop.org/wiki/Software/fontconfig/
 arch=(x86_64)
 license=(custom)
-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'
-            '6a0c171c0bce4ffd70fc5c8e275113d2866148591c952f35c69587e8b423c6a4')
+depends=(
+  fontconfig
+  lib32-expat
+  libfreetype.so
+)
+makedepends=(
+  git
+  gperf
+  lib32-freetype2
+  lib32-json-c
+  python-lxml
+  python-six
+)
+provides=(libfontconfig.so)
+install=fontconfig-32.install
+_tag=d06103e3e764bd43758e213414a1716858ab384c
+source=(
+  git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=${_tag}
+  fontconfig-32.hook
+)
+b2sums=('SKIP'
+        '32d89de4c80edbe14c67852e9b8c5b38208aa97447bc618e160f0b5e75eac6597c61e43c18e1cc7efdc89b44365b09be4cdedd59bce6f400927db88993d99e5b')
 
-# a nice page to test font matching:
-# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
-# http://getemoji.com/
-
-pkgver() {
+prepare() {
   cd fontconfig
-  git describe --tags | sed 's/-/+/g'
+  NOCONFIGURE=1 ./autogen.sh
 }
 
-prepare() {
+pkgver() {
   cd fontconfig
-  NOCONFIGURE=1 ./autogen.sh
+  git describe --tags
 }
 
 build() {
   cd fontconfig
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
   ./configure --prefix=/usr \
     --libdir=/usr/lib32 \
+    --localstatedir=/var \
     --sysconfdir=/etc \
-    --with-templatedir=/etc/fonts/conf.avail \
-    --localstatedir=/var \
     --disable-static \
+    --with-add-fonts=/usr/local/share/fonts \
     --with-default-fonts=/usr/share/fonts \
-    --with-add-fonts=/usr/local/share/fonts
+    --with-templatedir=/etc/fonts/conf.avail
   make
 }
 
-check() {
-  cd fontconfig
-  make -k check
-}
-
 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
+  make DESTDIR="${pkgdir}" install -C fontconfig
+  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 -Dm 644 *.hook -t "${pkgdir}"/usr/share/libalpm/hooks/
+  install -dm 755 "${pkgdir}"/usr/share/licenses
+  ln -s fontconfig "${pkgdir}"/usr/share/licenses/lib32-fontconfig
 }
 
 # vim:set sw=2 et: