Date: Sunday, January 15, 2017 @ 16:28:44
Author: andyrtr
Revision: 286563
archrelease: copy trunk to extra-any
Added:
xorg-mkfontdir/repos/extra-any/PKGBUILD
(from rev 286562, xorg-mkfontdir/trunk/PKGBUILD)
xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.hook
(from rev 286562, xorg-mkfontdir/trunk/xorg-mkfontdir.hook)
xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.install
(from rev 286562, xorg-mkfontdir/trunk/xorg-mkfontdir.install)
xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.script
(from rev 286562, xorg-mkfontdir/trunk/xorg-mkfontdir.script)
Deleted:
xorg-mkfontdir/repos/extra-any/PKGBUILD
xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.hook
------------------------+
PKGBUILD | 64 ++++++++++++++++++++++++-----------------------
xorg-mkfontdir.hook | 31 ++++++++--------------
xorg-mkfontdir.install | 8 +++++
xorg-mkfontdir.script | 9 ++++++
4 files changed, 63 insertions(+), 49 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-15 16:28:32 UTC (rev 286562)
+++ PKGBUILD 2017-01-15 16:28:44 UTC (rev 286563)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xorg-mkfontdir
-pkgver=1.0.7
-pkgrel=5
-pkgdesc="Create an index of X font files in a directory"
-arch=(any)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('sh' 'xorg-mkfontscale')
-makedepends=('xorg-util-macros')
-groups=('xorg' 'xorg-apps')
-source=(http://xorg.freedesktop.org/archive/individual/app/mkfontdir-${pkgver}.tar.bz2
- xorg-mkfontdir.hook)
-sha1sums=('3c06dad8a5fbf7362b51fb7d6b1ab805eba40336'
- '67eaa9c5948ad6ac09464d24246f60b0c6b82f2c')
-
-build() {
- cd "${srcdir}/mkfontdir-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/mkfontdir-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
- install -Dm644 $srcdir/xorg-mkfontdir.hook
"${pkgdir}/usr/share/libalpm/hooks/xorg-mkfontdir.hook"
-}
Copied: xorg-mkfontdir/repos/extra-any/PKGBUILD (from rev 286562,
xorg-mkfontdir/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-01-15 16:28:44 UTC (rev 286563)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=xorg-mkfontdir
+pkgver=1.0.7
+pkgrel=7
+pkgdesc="Create an index of X font files in a directory"
+arch=(any)
+url="https://xorg.freedesktop.org/";
+license=('custom')
+depends=('bash' 'xorg-mkfontscale')
+makedepends=('xorg-util-macros')
+groups=('xorg' 'xorg-apps')
+install=xorg-mkfontdir.install
+source=(https://xorg.freedesktop.org/archive/individual/app/mkfontdir-${pkgver}.tar.bz2
+ xorg-mkfontdir.hook
+ xorg-mkfontdir.script)
+sha256sums=('56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530'
+ 'df6f71601b2be5161bb8e980acee753d6ef86d71221f61627422bcbe87ed09cd'
+ '06c60e3e46a76b5300c3224cea6b5094556ea712a08ff9a0103be2eb58d222b5')
+
+build() {
+ cd mkfontdir-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd mkfontdir-${pkgver}
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+ install -Dm644 ../xorg-mkfontdir.hook
"${pkgdir}/usr/share/libalpm/hooks/xorg-mkfontdir.hook"
+ install -D ../xorg-mkfontdir.script
"${pkgdir}/usr/share/libalpm/scripts/xorg-mkfontdir"
+}
Deleted: xorg-mkfontdir.hook
===================================================================
--- xorg-mkfontdir.hook 2017-01-15 16:28:32 UTC (rev 286562)
+++ xorg-mkfontdir.hook 2017-01-15 16:28:44 UTC (rev 286563)
@@ -1,19 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/fonts/*/*.bdf
-Target = usr/share/fonts/*/*.otf
-Target = usr/share/fonts/*/*.pcf.gz
-Target = usr/share/fonts/*/*.pfa
-Target = usr/share/fonts/*/*.pfb
-Target = usr/share/fonts/*/*.ttc
-Target = usr/share/fonts/*/*.ttf
-Target = usr/share/fonts/*/*.woff
-
-[Action]
-Description = Creating index of X font files...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do dirname $f; done | uniq | while read -r
d; do mkfontscale /$d && mkfontdir /$d; done'
-NeedsTargets
Copied: xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.hook (from rev 286562,
xorg-mkfontdir/trunk/xorg-mkfontdir.hook)
===================================================================
--- xorg-mkfontdir.hook (rev 0)
+++ xorg-mkfontdir.hook 2017-01-15 16:28:44 UTC (rev 286563)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*/
+
+[Action]
+Description = Updating X fontdir indices...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/xorg-mkfontdir
+NeedsTargets
Copied: xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.install (from rev 286562,
xorg-mkfontdir/trunk/xorg-mkfontdir.install)
===================================================================
--- xorg-mkfontdir.install (rev 0)
+++ xorg-mkfontdir.install 2017-01-15 16:28:44 UTC (rev 286563)
@@ -0,0 +1,8 @@
+post_install() {
+ if [[ -d /usr/share/fonts ]]; then
+ echo -n "Creating X fontdir indices..."
+ find /usr/share/fonts -mindepth 1 -type d -printf '%p/\n' |
+ /usr/share/libalpm/scripts/xorg-mkfontdir
+ echo " done."
+ fi
+}
Copied: xorg-mkfontdir/repos/extra-any/xorg-mkfontdir.script (from rev 286562,
xorg-mkfontdir/trunk/xorg-mkfontdir.script)
===================================================================
--- xorg-mkfontdir.script (rev 0)
+++ xorg-mkfontdir.script 2017-01-15 16:28:44 UTC (rev 286563)
@@ -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
