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

[Jan Steffens]

    Date: Tuesday, March 23, 2021 @ 18:43:54
  Author: heftig
Revision: 900975

2.13.93-2: meson, changes for new hook in fontconfig

Modified:
  lib32-fontconfig/trunk/PKGBUILD
  lib32-fontconfig/trunk/fontconfig-32.hook
  lib32-fontconfig/trunk/fontconfig-32.install

-----------------------+
 PKGBUILD              |   28 ++++++++++++----------------
 fontconfig-32.hook    |    3 +++
 fontconfig-32.install |    3 +--
 3 files changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-23 18:43:53 UTC (rev 900974)
+++ PKGBUILD	2021-03-23 18:43:54 UTC (rev 900975)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-fontconfig
 pkgver=2.13.93
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Library for configuring and customizing font access'
 url=https://www.freedesktop.org/wiki/Software/fontconfig/
@@ -17,11 +17,9 @@
 )
 makedepends=(
   git
+  meson
   gperf
   lib32-freetype2
-  lib32-json-c
-  python-lxml
-  python-six
 )
 provides=(libfontconfig.so)
 install=fontconfig-32.install
@@ -31,11 +29,11 @@
   fontconfig-32.hook
 )
 b2sums=('SKIP'
-        '32d89de4c80edbe14c67852e9b8c5b38208aa97447bc618e160f0b5e75eac6597c61e43c18e1cc7efdc89b44365b09be4cdedd59bce6f400927db88993d99e5b')
+        '1cba71810c9bde6ecb6fac124e458fb7260be3ea72ade82b836e0e8e1eaa7c7df31e6e92e405fa420325cec0ce14d0f19630e777308032b0c26ec96a3d668d93')
 
 prepare() {
   cd fontconfig
-  NOCONFIGURE=1 ./autogen.sh
+  git cherry-pick -n 4e42925096e9  # Fix meson install
 }
 
 pkgver() {
@@ -44,23 +42,21 @@
 }
 
 build() {
-  cd fontconfig
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
-  ./configure --prefix=/usr \
+  arch-meson fontconfig build \
     --libdir=/usr/lib32 \
-    --localstatedir=/var \
-    --sysconfdir=/etc \
-    --disable-static \
-    --with-add-fonts=/usr/local/share/fonts \
-    --with-default-fonts=/usr/share/fonts \
-    --with-templatedir=/etc/fonts/conf.avail
-  make
+    -D doc=disabled
+  meson compile -C build
 }
 
+check() {
+  meson test -C build --print-errorlogs
+}
+
 package() {
-  make DESTDIR="${pkgdir}" install -C fontconfig
+  DESTDIR="${pkgdir}" meson install -C build
   rm -r "${pkgdir}"/{etc,usr/{include,share}}
   mv "${pkgdir}"/usr/bin/fc-cache{,-32}
   find "${pkgdir}"/usr/bin -type f -not -name '*-32' -delete

Modified: fontconfig-32.hook
===================================================================
--- fontconfig-32.hook	2021-03-23 18:43:53 UTC (rev 900974)
+++ fontconfig-32.hook	2021-03-23 18:43:54 UTC (rev 900975)
@@ -3,7 +3,10 @@
 Operation = Install
 Operation = Upgrade
 Operation = Remove
+Target = etc/fonts/conf.d/*
 Target = usr/share/fonts/*
+Target = usr/share/fontconfig/conf.avail/*
+Target = usr/share/fontconfig/conf.default/*
 
 [Action]
 Description = Updating 32-bit fontconfig cache...

Modified: fontconfig-32.install
===================================================================
--- fontconfig-32.install	2021-03-23 18:43:53 UTC (rev 900974)
+++ fontconfig-32.install	2021-03-23 18:43:54 UTC (rev 900975)
@@ -1,8 +1,7 @@
 post_upgrade() {
   # a full forced directory scan is required here
-  echo -n "Rebuilding 32-bit fontconfig cache..."
+  echo "Rebuilding 32-bit fontconfig cache..."
   /usr/bin/fc-cache-32 -rs
-  echo " done."
 }
 
 post_install() {