[arch-commits] Commit in ttf-carlito/repos/extra-any (4 files)

[Andreas Radke]

    Date: Thursday, July 11, 2019 @ 11:58:43
  Author: andyrtr
Revision: 357746

archrelease: copy trunk to extra-any

Added:
  ttf-carlito/repos/extra-any/30-0-google-crosextra-carlito-fontconfig.conf
    (from rev 357745, ttf-carlito/trunk/30-0-google-crosextra-carlito-fontconfig.conf)
  ttf-carlito/repos/extra-any/62-google-crosextra-carlito-fontconfig.conf
    (from rev 357745, ttf-carlito/trunk/62-google-crosextra-carlito-fontconfig.conf)
  ttf-carlito/repos/extra-any/PKGBUILD
    (from rev 357745, ttf-carlito/trunk/PKGBUILD)
Deleted:
  ttf-carlito/repos/extra-any/PKGBUILD

-----------------------------------------------+
 30-0-google-crosextra-carlito-fontconfig.conf |   17 +++++++
 62-google-crosextra-carlito-fontconfig.conf   |   16 ++++++
 PKGBUILD                                      |   58 ++++++++++++++----------
 3 files changed, 67 insertions(+), 24 deletions(-)

Copied: ttf-carlito/repos/extra-any/30-0-google-crosextra-carlito-fontconfig.conf (from rev 357745, ttf-carlito/trunk/30-0-google-crosextra-carlito-fontconfig.conf)
===================================================================
--- 30-0-google-crosextra-carlito-fontconfig.conf	                        (rev 0)
+++ 30-0-google-crosextra-carlito-fontconfig.conf	2019-07-11 11:58:43 UTC (rev 357746)
@@ -0,0 +1,17 @@
+<?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>

Copied: ttf-carlito/repos/extra-any/62-google-crosextra-carlito-fontconfig.conf (from rev 357745, ttf-carlito/trunk/62-google-crosextra-carlito-fontconfig.conf)
===================================================================
--- 62-google-crosextra-carlito-fontconfig.conf	                        (rev 0)
+++ 62-google-crosextra-carlito-fontconfig.conf	2019-07-11 11:58:43 UTC (rev 357746)
@@ -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>

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-11 11:58:34 UTC (rev 357745)
+++ PKGBUILD	2019-07-11 11:58:43 UTC (rev 357746)
@@ -1,24 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Kewl <xrjy at nygb.rh.bet(rot13)>
-# Contributor: Justin Settle <jus10 at partlycloudy dot org>
-
-pkgname=ttf-carlito
-pkgver=20130920
-pkgrel=2
-pkgdesc='Googles 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=('ttf-font')
-source=("http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${pkgname#ttf-}-${pkgver}.tar.gz")
-sha256sums=('4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a')
-
-package() {
-  cd "crosextrafonts-${pkgname#ttf-}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share/fonts/TTF/"
-  install -m644 *.ttf "${pkgdir}/usr/share/fonts/TTF/"
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: ttf-carlito/repos/extra-any/PKGBUILD (from rev 357745, ttf-carlito/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-11 11:58:43 UTC (rev 357746)
@@ -0,0 +1,34 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Kewl <xrjy at nygb.rh.bet(rot13)>
+# Contributor: Justin Settle <jus10 at partlycloudy dot org>
+
+pkgname=ttf-carlito
+pkgver=20130920
+pkgrel=3
+pkgdesc='Googles 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)
+sha256sums=('4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a'
+            'e13cc8ac68125ade2a99a2672dd1e53956dca93e0aaa3df833cbbf4fd15dc791'
+            '31a74cd8044c8c8644f1555c06f406559f2e14334dd671a608145431a4299bd3')
+
+package() {
+  cd "crosextrafonts-${pkgname#ttf-}-${pkgver}"
+
+  install -d "${pkgdir}/usr/share/fonts/${pkgname}/"
+  install -m644 *.ttf "${pkgdir}/usr/share/fonts/${pkgname}/"
+
+  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"
+
+  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"
+}