[arch-commits] Commit in xorg-mkfontscale/trunk (4 files)

[Andreas Radke]

    Date: Monday, March 4, 2019 @ 18:29:37
  Author: andyrtr
Revision: 347049

upgpkg: xorg-mkfontscale 1.2.0-1

upstream update 1.2.0 - now also includes and obsoletes mkfontdir pkg

Added:
  xorg-mkfontscale/trunk/xorg-mkfontscale.hook
  xorg-mkfontscale/trunk/xorg-mkfontscale.install
  xorg-mkfontscale/trunk/xorg-mkfontscale.script
Modified:
  xorg-mkfontscale/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   18 ++++++++++++++----
 xorg-mkfontscale.hook    |   13 +++++++++++++
 xorg-mkfontscale.install |    8 ++++++++
 xorg-mkfontscale.script  |    9 +++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-04 17:53:17 UTC (rev 347048)
+++ PKGBUILD	2019-03-04 18:29:37 UTC (rev 347049)
@@ -2,18 +2,25 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-mkfontscale
-pkgver=1.1.3
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Create an index of scalable font files for X"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
 license=('custom')
+install=xorg-mkfontscale.install
 depends=('freetype2' 'libfontenc')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
-source=(https://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2{,.sig})
-sha512sums=('509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62'
-            'SKIP')
+provides=('xorg-mkfontdir')
+replaces=('xorg-mkfontdir')
+source=(https://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2{,.sig}
+        xorg-mkfontscale.hook
+        xorg-mkfontscale.script)
+sha512sums=('3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f'
+            'SKIP'
+            '80e6995af4827e487d0a141760781d9d295a1c0d935ede53c4ba0291a4f0569686fcd7a6186d08953da1cf71d14a4c7c8f4092c731e17008941f014df3a4c917'
+            '2a53d38c85b962eaee534f6f3fad4122412a7200c6787fd8216eb191904e2e3727400606a73d6f09017016f6c1360e5148afbb8fbe16e35c5e5cd55dec635387')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alan.coopersmith at oracle.com>
 
 build() {
@@ -27,4 +34,7 @@
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  install -Dm644 ../xorg-mkfontscale.hook "${pkgdir}/usr/share/libalpm/hooks/xorg-mkfontscale.hook"
+  install -D ../xorg-mkfontscale.script "${pkgdir}/usr/share/libalpm/scripts/xorg-mkfontscale"
 }

Added: xorg-mkfontscale.hook
===================================================================
--- xorg-mkfontscale.hook	                        (rev 0)
+++ xorg-mkfontscale.hook	2019-03-04 18:29:37 UTC (rev 347049)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*/
+Target = !usr/share/fonts/encodings/*
+
+[Action]
+Description = Updating X fontdir indices...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/xorg-mkfontscale
+NeedsTargets

Added: xorg-mkfontscale.install
===================================================================
--- xorg-mkfontscale.install	                        (rev 0)
+++ xorg-mkfontscale.install	2019-03-04 18:29:37 UTC (rev 347049)
@@ -0,0 +1,8 @@
+post_install() {
+  if [[ -d /usr/share/fonts ]]; then
+    echo -n "Creating X fontdir indices..."
+    find /usr/share/fonts -mindepth 1 -path /usr/share/fonts/encodings -prune \
+      -o -type d -printf '%p/\n' | /usr/share/libalpm/scripts/xorg-mkfontscale
+    echo " done."
+  fi
+}

Added: xorg-mkfontscale.script
===================================================================
--- xorg-mkfontscale.script	                        (rev 0)
+++ xorg-mkfontscale.script	2019-03-04 18:29:37 UTC (rev 347049)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+sort -r | while read -r d; do
+  [[ -d $d ]] || continue
+  mkfontscale "$d"
+  mkfontdir "$d"
+  find "$d"fonts.{scale,dir} -maxdepth 0 -size -3c -delete
+  rmdir --ignore-fail-on-non-empty "$d"
+done