Date: Friday, October 21, 2022 @ 17:13:43
  Author: heftig
Revision: 458571

2.14.1-1

Modified:
  fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-21 16:54:16 UTC (rev 458570)
+++ PKGBUILD    2022-10-21 17:13:43 UTC (rev 458571)
@@ -1,5 +1,5 @@
 # Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Maintainer: Jan de Groot <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
 
 pkgname=fontconfig
 pkgver=2.14.1
@@ -9,20 +9,31 @@
 url=https://www.freedesktop.org/wiki/Software/fontconfig/
 arch=(x86_64)
 license=(custom)
-depends=(libexpat.so libfreetype.so)
-makedepends=(git meson gperf expat freetype2
-             docbook-utils docbook-sgml perl-sgmls)
-provides=(libfontconfig.so fontconfig-docs)
+depends=(
+  expat
+  freetype2
+)
+makedepends=(
+  docbook-sgml
+  docbook-utils
+  git
+  gperf
+  meson
+  perl-sgmls
+)
+provides=(fontconfig-docs)
 conflicts=(fontconfig-docs)
 replaces=('fontconfig-docs<2:2.13.93-1')
+backup=(etc/fonts/fonts.conf)
 install=fontconfig.install
-backup=(etc/fonts/fonts.conf)
 options=(debug)
 _commit=c45e09df1ef235d653d56aef05012f6a3cc57979  # tags/2.14.1^0
-source=("git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit";
-        40-fontconfig-config.script
-        40-fontconfig-config.hook
-        fontconfig.hook)
+source=(
+  
"git+https://gitlab.freedesktop.org/fontconfig/fontconfig.git#commit=$_commit";
+  40-fontconfig-config.script
+  40-fontconfig-config.hook
+  fontconfig.hook
+)
 b2sums=('SKIP'
         
'7fb63e76ab126bc0a7decfd74c53429ad1ce6d13de2f14037259616d8d4150b8fa4601c7f02b75918ccd5995d424816dc9d01a5fe7e39dc3dd1fcc83dfdb0fe8'
         
'b06b3f2b8c0c38139a9247c26a641e6dc01d50b530478dd14133175a603f60b0af901af16c9fcf1ce73d23786ea14bfdbacd39f1dcfd88f6382965ad22be1411'
@@ -34,14 +45,16 @@
 
 pkgver() {
   cd fontconfig
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 build() {
-  arch-meson fontconfig build \
-    -D doc-txt=disabled \
-    -D doc-pdf=disabled \
+  local meson_options=(
     -D doc-html=enabled
+    -D doc-pdf=disabled
+    -D doc-txt=disabled
+  )
+  arch-meson fontconfig build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -50,6 +63,12 @@
 }
 
 package() {
+  depends+=(
+    libexpat.so
+    libfreetype.so
+  )
+  provides+=(libfontconfig.so)
+
   meson install -C build --destdir "$pkgdir"
 
   # Handle conf.d using the hook to avoid overwriting the symlinks on upgrade
@@ -59,10 +78,10 @@
     rm "$_f"
   done
 
-  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+  install -Dm644 *.hook -t "$pkgdir/usr/share/libalpm/hooks"
   install -D 40-fontconfig-config.script \
     "$pkgdir/usr/share/libalpm/scripts/40-fontconfig-config"
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 fontconfig/COPYING
+  install -Dm644 fontconfig/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
-# vim:set sw=2 et:
+# vim:set sw=2 sts=-1 et:

Reply via email to