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

[Jan Steffens]

    Date: Monday, June 28, 2021 @ 22:42:54
  Author: heftig
Revision: 418772

2.13.94-1

Modified:
  fontconfig/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-28 21:39:04 UTC (rev 418771)
+++ PKGBUILD	2021-06-28 22:42:54 UTC (rev 418772)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=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/
@@ -17,7 +17,7 @@
 replaces=('fontconfig-docs<2:2.13.93-1')
 install=fontconfig.install
 backup=(etc/fonts/fonts.conf)
-_commit=d06103e3e764bd43758e213414a1716858ab384c  # tags/2.13.93^0
+_commit=e291fda7d42e5d64379555097a066d9c2c4efce3  # tags/2.13.94^0
 source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit"
         40-fontconfig-config.script
         40-fontconfig-config.hook
@@ -29,9 +29,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() {
@@ -52,7 +49,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 
   # Handle conf.d using the hook to avoid overwriting the symlinks on upgrade
   mkdir -p "$pkgdir/usr/share/fontconfig/conf.default"