[arch-commits] Commit in ttf-carlito/trunk (4 files)

Jan Steffens heftig at archlinux.org
Thu Jul 11 16:18:19 UTC 2019


    Date: Thursday, July 11, 2019 @ 16:18:18
  Author: heftig
Revision: 357756

20130920-4: Fix config, match ttf-caladea

Added:
  ttf-carlito/trunk/62-google-crosextra-carlito.conf
    (from rev 357755, ttf-carlito/trunk/62-google-crosextra-carlito-fontconfig.conf)
Modified:
  ttf-carlito/trunk/PKGBUILD
Deleted:
  ttf-carlito/trunk/30-0-google-crosextra-carlito-fontconfig.conf
  ttf-carlito/trunk/62-google-crosextra-carlito-fontconfig.conf

-----------------------------------------------+
 30-0-google-crosextra-carlito-fontconfig.conf |   17 ---------------
 62-google-crosextra-carlito-fontconfig.conf   |   16 --------------
 62-google-crosextra-carlito.conf              |   16 ++++++++++++++
 PKGBUILD                                      |   27 +++++++++---------------
 4 files changed, 27 insertions(+), 49 deletions(-)

Deleted: 30-0-google-crosextra-carlito-fontconfig.conf
===================================================================
--- 30-0-google-crosextra-carlito-fontconfig.conf	2019-07-11 15:17:46 UTC (rev 357755)
+++ 30-0-google-crosextra-carlito-fontconfig.conf	2019-07-11 16:18:18 UTC (rev 357756)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-         <!-- Microsoft -->
-        <alias binding="same">
-          <family>Calibri</family>
-            <accept>
-              <family>Carlito</family>
-            </accept>
-        </alias>
-        <alias binding="same">
-          <family>Carlito</family>
-            <default>
-              <family>Calibri</family>
-            </default>
-        </alias>
-</fontconfig>

Deleted: 62-google-crosextra-carlito-fontconfig.conf
===================================================================
--- 62-google-crosextra-carlito-fontconfig.conf	2019-07-11 15:17:46 UTC (rev 357755)
+++ 62-google-crosextra-carlito-fontconfig.conf	2019-07-11 16:18:18 UTC (rev 357756)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-        <alias>
-          <family>sans-serif</family>
-            <prefer>
-              <family>Carlito</family>
-            </prefer>
-        </alias>
-        <alias>
-          <family>Carlito</family>
-            <default>
-              <family>sans-serif</family>
-            </default>
-        </alias>
-</fontconfig>

Copied: ttf-carlito/trunk/62-google-crosextra-carlito.conf (from rev 357755, ttf-carlito/trunk/62-google-crosextra-carlito-fontconfig.conf)
===================================================================
--- 62-google-crosextra-carlito.conf	                        (rev 0)
+++ 62-google-crosextra-carlito.conf	2019-07-11 16:18:18 UTC (rev 357756)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+        <alias>
+          <family>sans-serif</family>
+            <prefer>
+              <family>Carlito</family>
+            </prefer>
+        </alias>
+        <alias>
+          <family>Carlito</family>
+            <default>
+              <family>sans-serif</family>
+            </default>
+        </alias>
+</fontconfig>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-11 15:17:46 UTC (rev 357755)
+++ PKGBUILD	2019-07-11 16:18:18 UTC (rev 357756)
@@ -4,31 +4,26 @@
 
 pkgname=ttf-carlito
 pkgver=20130920
-pkgrel=3
-pkgdesc='Googles Carlito font'
-arch=('any')
-license=('custom:OFL')
+pkgrel=4
+pkgdesc="Google's Carlito font"
+arch=(any)
+license=(custom:OFL)
 url='https://code.google.com/p/chromium/issues/detail?id=280557'
-depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-provides=('google-crosextra-carlito-fonts')
-source=("https://gsdview.appspot.com/chromeos-localmirror/distfiles/crosextrafonts-${pkgname#ttf-}-${pkgver}.tar.gz"
-        30-0-google-crosextra-carlito-fontconfig.conf
-        62-google-crosextra-carlito-fontconfig.conf)
+provides=(google-crosextra-carlito-fonts)
+source=("https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-$pkgver.tar.gz"
+        62-google-crosextra-carlito.conf)
 sha256sums=('4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a'
-            'e13cc8ac68125ade2a99a2672dd1e53956dca93e0aaa3df833cbbf4fd15dc791'
             '31a74cd8044c8c8644f1555c06f406559f2e14334dd671a608145431a4299bd3')
 
 package() {
-  cd "crosextrafonts-${pkgname#ttf-}-${pkgver}"
+  cd crosextrafonts-carlito-$pkgver
 
-  install -d "${pkgdir}/usr/share/fonts/${pkgname}/"
-  install -m644 *.ttf "${pkgdir}/usr/share/fonts/${pkgname}/"
+  install -Dt "$pkgdir/usr/share/fonts/${pkgname#ttf-}" -m644 *.ttf
 
-  install -Dm644 ../30-0-google-crosextra-carlito-fontconfig.conf "$pkgdir/etc/fonts/conf.avail/30-0-google-crosextra-carlito-fontconfig.conf"
-  install -Dm644 ../62-google-crosextra-carlito-fontconfig.conf "$pkgdir/etc/fonts/conf.avail/62-google-crosextra-carlito-fontconfig.conf"
+  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/*
 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }



More information about the arch-commits mailing list