[arch-commits] Commit in ttf-droid/trunk (9 files)

Jan Steffens heftig at archlinux.org
Thu Jul 11 16:34:55 UTC 2019


    Date: Thursday, July 11, 2019 @ 16:34:54
  Author: heftig
Revision: 488920

20121017-7: Enable config by default (required by ttf-font) and remove unneeded depends

Added:
  ttf-droid/trunk/60-droid-sans-mono.conf
    (from rev 488919, ttf-droid/trunk/sans-mono-fontconfig.conf)
  ttf-droid/trunk/65-droid-kufi.conf
    (from rev 488919, ttf-droid/trunk/kufi-fontconfig.conf)
  ttf-droid/trunk/65-droid-sans.conf
    (from rev 488919, ttf-droid/trunk/sans-fontconfig.conf)
  ttf-droid/trunk/65-droid-serif.conf
    (from rev 488919, ttf-droid/trunk/serif-fontconfig.conf)
Modified:
  ttf-droid/trunk/PKGBUILD
Deleted:
  ttf-droid/trunk/kufi-fontconfig.conf
  ttf-droid/trunk/sans-fontconfig.conf
  ttf-droid/trunk/sans-mono-fontconfig.conf
  ttf-droid/trunk/serif-fontconfig.conf

----------+
 PKGBUILD |   36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

Copied: ttf-droid/trunk/60-droid-sans-mono.conf (from rev 488919, ttf-droid/trunk/sans-mono-fontconfig.conf)
===================================================================
(Binary files differ)

Copied: ttf-droid/trunk/65-droid-kufi.conf (from rev 488919, ttf-droid/trunk/kufi-fontconfig.conf)
===================================================================
(Binary files differ)

Copied: ttf-droid/trunk/65-droid-sans.conf (from rev 488919, ttf-droid/trunk/sans-fontconfig.conf)
===================================================================
(Binary files differ)

Copied: ttf-droid/trunk/65-droid-serif.conf (from rev 488919, ttf-droid/trunk/serif-fontconfig.conf)
===================================================================
(Binary files differ)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-11 16:32:02 UTC (rev 488919)
+++ PKGBUILD	2019-07-11 16:34:54 UTC (rev 488920)
@@ -3,33 +3,27 @@
 
 pkgname=ttf-droid
 pkgver=20121017
-pkgrel=6
+pkgrel=7
 pkgdesc="General-purpose fonts released by Google as part of Android"
 arch=('any')
 license=('Apache')
 url='https://www.droidfonts.com/'
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 provides=('ttf-font')
-source=('https://sources.archlinux.org/other/community/ttf-droid/ttf-droid-20121017.tar.xz' 'serif-fontconfig.conf' 'sans-fontconfig.conf' 'sans-mono-fontconfig.conf' 'kufi-fontconfig.conf' )
-md5sums=('0fa20eb63d7d05b23be955777bb52a5d'
-         '7db18cf9df70ee41fbab444c80117ec6'
-         '61f59063f84bd1331a91e21ebf86d43d'
-         '7d7787d92e7b5089558a6d68c99813e3'
-         '954a340fc7cb2846826a97d2b752501d')
+source=("https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz"
+        60-droid-sans-mono.conf 65-droid-sans.conf 65-droid-serif.conf 65-droid-kufi.conf)
+sha256sums=('f068efec9e8201fe0d1be75b1a4751c98d14dc44267b2237f549403b2a8069e3'
+            '42da7d1ac6d7055971c8b1bb98a83e893fbed621534b04247a5f6ed89ca14d44'
+            '93a0dc8e3258be4fafa68df120add114018bb723af7c0d61b60c6d908fcd87b2'
+            '311c79e55fc58e83f066377393e59865518dcbe09b51e5fe3459b69fbac3b6af'
+            'fc208932ae52bc678415b66b2fa958d24d6100f2d9609d5564c611b3c53b38c7')
 
-package()
-{
-        # Install fonts
-        cd $srcdir/google-droid-fonts-$pkgver
-        install -d $pkgdir/usr/share/fonts/TTF/ 
-        install -m644 *.ttf $pkgdir/usr/share/fonts/TTF/ 
+package() {
+  # Install fonts
+  install -Dt "$pkgdir/usr/share/fonts/${pkgname#ttf-}" -m644 google-droid-fonts-$pkgver/*.ttf
 
-        # Install fontconfig
-        cd $srcdir
-        install -d $pkgdir/etc/fonts/conf.avail/
-        install -m644 sans-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-sans-fontconfig.conf
-        install -m644 sans-mono-fontconfig.conf $pkgdir/etc/fonts/conf.avail/60-$pkgname-sans-mono-fontconfig.conf
-        install -m644 serif-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-serif-fontconfig.conf
-        install -m644 kufi-fontconfig.conf $pkgdir/etc/fonts/conf.avail/65-$pkgname-kufi-fontconfig.conf
+  # Install fontconfig
+  install -Dt "$pkgdir/etc/fonts/conf.avail" -m644 *.conf
+  mkdir "$pkgdir/etc/fonts/conf.d"
+  ln -srt "$pkgdir/etc/fonts/conf.d" "$pkgdir"/etc/fonts/conf.avail/*
 }
 

Deleted: kufi-fontconfig.conf
===================================================================
(Binary files differ)

Deleted: sans-fontconfig.conf
===================================================================
(Binary files differ)

Deleted: sans-mono-fontconfig.conf
===================================================================
(Binary files differ)

Deleted: serif-fontconfig.conf
===================================================================
(Binary files differ)


More information about the arch-commits mailing list