From fd038c48dbdf6cee0cc738446332cc354f47463f Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees at me.com>
Date: Fri, 3 Aug 2018 03:21:48 -0400
Subject: user/ttf-noto: fix license, drop unused cjk config file

---
 user/ttf-noto/90-non-tt-noto-sans-cjk.conf | 89 ------------------------------
 user/ttf-noto/APKBUILD                     |  6 +-
 2 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 user/ttf-noto/90-non-tt-noto-sans-cjk.conf

(limited to 'user/ttf-noto')

diff --git a/user/ttf-noto/90-non-tt-noto-sans-cjk.conf b/user/ttf-noto/90-non-tt-noto-sans-cjk.conf
deleted file mode 100644
index 92f4cff7e..000000000
--- a/user/ttf-noto/90-non-tt-noto-sans-cjk.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-
-  <match target="font" >
-    <test name="family" >
-      <string>Noto Sans CJK SC</string>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="globaladvance">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <match target="font" >
-    <test name="family" >
-      <string>Noto Sans CJK TC</string>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="globaladvance">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <match target="font" >
-    <test name="family" >
-      <string>Noto Sans CJK JP</string>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="globaladvance">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <match target="font" >
-    <test name="family" >
-      <string>Noto Sans CJK KR</string>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="globaladvance">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-</fontconfig>
diff --git a/user/ttf-noto/APKBUILD b/user/ttf-noto/APKBUILD
index 4a24aa97a..3551fe7fe 100644
--- a/user/ttf-noto/APKBUILD
+++ b/user/ttf-noto/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ttf-noto
 pkgver=20170403
-pkgrel=0
+pkgrel=1
 pkgdesc="Noto font family"
 url="https://www.google.com/get/noto/"
 arch="noarch"
 options="!check"  # how do you test a font?
-license="SIL-1.1"
+license="OFL-1.1"
 depends="fontconfig"
 makedepends=""
 # added fontconfig configuration from:
@@ -16,7 +16,6 @@ source="https://dev.gentoo.org/~floppym/dist/noto-$pkgver.tar.xz
 	40-noto-arabic.conf
 	45-noto-sans.conf
 	45-noto-serif.conf
-	90-non-tt-noto-sans-cjk.conf
 	90-tt-noto-sans.conf
 	90-tt-noto-serif.conf"
 builddir="$srcdir"/noto-$pkgver
@@ -32,6 +31,5 @@ sha512sums="f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81
 47396e7a4e5dfb38d3df6dff0b4584757cc132f393d3410463eefc3dbb5f2af592a6b07a4c098d8c594be03f23e4eb84b76b672245fe0cea816927cf535ea270  40-noto-arabic.conf
 748dfecbc3ad5c3750764e6ae889bbc4e614885237bb91ece138d2dc5014fd41ea6361b32982cfa4e76c7c092e0b93f90cccd0b92acbd408b7c302c44c1523e6  45-noto-sans.conf
 5059295a1c36c4ec4aae61443221ee74876315127895da0773e4feb77e70cfc4b7923dde8f6510d6cf9de019082e15f1f4fd4b53f0bce4d2a681541f2de587df  45-noto-serif.conf
-7cf1ec09d6226c46ff7bd796ff526aa42b7221eeb8a2e171e7dbab837fceb96a03b9c5d7bd6e88dbee97cdf54e443d940590b6be51478b88ebca19a419831080  90-non-tt-noto-sans-cjk.conf
 e5d252e4ee265f9cc7a91eea0e0f8c74315a60cbce606860e0f9e722eb9331f8d87d541dd715bef46bdb4e637bab0344f2fd98cc0424e7cfa17e588efa07eb33  90-tt-noto-sans.conf
 4f8760f7eeae99050a3b8ac73f4eeeb5ad32e9e5224034292e3ecdc260ffcc92f3ae45aa35e9f86905fce4ff909bb3263e25d8f4fe56dacba2fb3de2107e314f  90-tt-noto-serif.conf"
-- 
cgit v1.2.3-60-g2f50