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

[Jan Steffens]

    Date: Monday, June 28, 2021 @ 22:43:02
  Author: heftig
Revision: 967801

2.13.94-1

Modified:
  lib32-fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-28 22:17:59 UTC (rev 967800)
+++ PKGBUILD	2021-06-28 22:43:02 UTC (rev 967801)
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=lib32-fontconfig
-pkgver=2.13.93
-pkgrel=4
+pkgver=2.13.94
+pkgrel=1
 epoch=2
 pkgdesc='Library for configuring and customizing font access'
 url=https://www.freedesktop.org/wiki/Software/fontconfig/
@@ -23,7 +23,7 @@
 )
 provides=(libfontconfig.so)
 install=fontconfig-32.install
-_tag=d06103e3e764bd43758e213414a1716858ab384c
+_tag=42ca13917a2f8bebfb9e6f174062e68419df3572
 source=(
   git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#tag=${_tag}
   fontconfig-32.hook
@@ -33,9 +33,6 @@
 
 prepare() {
   cd fontconfig
-  git cherry-pick -n 4e42925096e9  # Fix meson install
-  git cherry-pick -n 10c7390e358c  # Fix default font dirs
-  git cherry-pick -n df29933e1a06  # https://bugs.archlinux.org/task/70141
 }
 
 pkgver() {
@@ -58,7 +55,7 @@
 }
 
 package() {
-  DESTDIR="${pkgdir}" meson install -C build
+  meson install -C build --destdir "${pkgdir}"
   rm -r "${pkgdir}"/{etc,usr/{include,share}}
   mv "${pkgdir}"/usr/bin/fc-cache{,-32}
   find "${pkgdir}"/usr/bin -type f -not -name '*-32' -delete