summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO25
-rw-r--r--46-noto-mono.conf10
-rw-r--r--46-noto-sans.conf10
-rw-r--r--46-noto-serif.conf10
-rw-r--r--66-noto-mono.conf10
-rw-r--r--66-noto-sans.conf10
-rw-r--r--66-noto-serif.conf10
-rw-r--r--PKGBUILD100
8 files changed, 137 insertions, 48 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 521300099775..259fb2e28dda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,25 +9,34 @@ pkgbase = noto-fonts-git
makedepends = python
makedepends = python-pip
makedepends = python-cairocffi
- depends = noto-fonts-config-files
provides = noto-fonts
provides = noto-fonts-extra
provides = noto-fonts
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
source = git+https://github.com/jopejoe1-aur/noto-fonts
source = activate
- md5sums = SKIP
- md5sums = 3f4a8c4eeb43639a1d910a6d462ffd0d
+ source = 66-noto-sans.conf
+ source = 66-noto-serif.conf
+ source = 66-noto-mono.conf
+ source = 46-noto-sans.conf
+ source = 46-noto-serif.conf
+ source = 46-noto-mono.conf
+ sha256sums = SKIP
+ sha256sums = 11a256a464d24c66d52c109868cbc5c0e40fe7f125dc7762b862e62af1764fd9
+ sha256sums = 52684bebf6447be22618d2a04ff37623ec92f9d8ccf6b6f972e5bcbcfee90d69
+ sha256sums = 4459944b63dc083107280f5d7375c69746bf80a09416a4a4909a100e58e5a33a
+ sha256sums = 4526289f59654e2a81dc734669a1ae4e416f9a56d0896ec3741c6bf065baf8a8
+ sha256sums = 83a8faf6a47954075f97a2d555048e2a6689c38603b2ca00150157bf645f4593
+ sha256sums = c94368b24506770767d003e5bcba589a8e402e489c240ee52453bf3ac7e9b5fa
+ sha256sums = f5c09b37280d7569b6c99a78511639be4ae25b8c5406464422fe0421fe13a884
pkgname = noto-fonts-hinted-git
pkgdesc = Noto fonts git version (hinted)
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-git
conflicts = noto-fonts-unhinted-variable-slim-git
@@ -40,7 +49,6 @@ pkgname = noto-fonts-unhinted-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-variable-git
conflicts = noto-fonts-unhinted-variable-slim-git
@@ -53,7 +61,6 @@ pkgname = noto-fonts-unhinted-variable-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-slim-git
@@ -66,7 +73,6 @@ pkgname = noto-fonts-unhinted-variable-slim-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-git
@@ -79,7 +85,6 @@ pkgname = noto-fonts-full-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-git
@@ -92,7 +97,6 @@ pkgname = noto-fonts-full-variable-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-git
@@ -105,7 +109,6 @@ pkgname = noto-fonts-full-variable-slim-git
conflicts = noto-fonts
conflicts = noto-fonts-extra
conflicts = noto-fonts
- conflicts = ttf-croscore
conflicts = noto-fonts-hinted-git
conflicts = noto-fonts-unhinted-git
conflicts = noto-fonts-unhinted-variable-git
diff --git a/46-noto-mono.conf b/46-noto-mono.conf
new file mode 100644
index 000000000000..6740c5f1f87d
--- /dev/null
+++ b/46-noto-mono.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>Noto Sans Mono</family>
+ <default>
+ <family>monospace</family>
+ </default>
+ </alias>
+</fontconfig>
diff --git a/46-noto-sans.conf b/46-noto-sans.conf
new file mode 100644
index 000000000000..fb2825f053e7
--- /dev/null
+++ b/46-noto-sans.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>Noto Sans</family>
+ <default>
+ <family>sans-serif</family>
+ </default>
+ </alias>
+</fontconfig>
diff --git a/46-noto-serif.conf b/46-noto-serif.conf
new file mode 100644
index 000000000000..d06c02d696e5
--- /dev/null
+++ b/46-noto-serif.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>Noto Serif</family>
+ <default>
+ <family>serif</family>
+ </default>
+ </alias>
+</fontconfig>
diff --git a/66-noto-mono.conf b/66-noto-mono.conf
new file mode 100644
index 000000000000..25612497fcab
--- /dev/null
+++ b/66-noto-mono.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Noto Sans Mono</family>
+ </prefer>
+ </alias>
+</fontconfig>
diff --git a/66-noto-sans.conf b/66-noto-sans.conf
new file mode 100644
index 000000000000..6c86c4a0535f
--- /dev/null
+++ b/66-noto-sans.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Noto Sans</family>
+ </prefer>
+ </alias>
+</fontconfig>
diff --git a/66-noto-serif.conf b/66-noto-serif.conf
new file mode 100644
index 000000000000..a503043ae956
--- /dev/null
+++ b/66-noto-serif.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Noto Serif</family>
+ </prefer>
+ </alias>
+</fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index 09c662afcc02..b794288c6623 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,30 @@
# Maintainer: Johannes Jöns <johannes@joens.email>
pkgbase=noto-fonts-git
-pkgname=('noto-fonts-hinted-git' 'noto-fonts-unhinted-git' 'noto-fonts-unhinted-variable-git' 'noto-fonts-unhinted-variable-slim-git' 'noto-fonts-full-git' 'noto-fonts-full-variable-git' 'noto-fonts-full-variable-slim-git')
+pkgname=('noto-fonts-hinted-git' 'noto-fonts-unhinted-git'
+ 'noto-fonts-unhinted-variable-git' 'noto-fonts-unhinted-variable-slim-git'
+ 'noto-fonts-full-git' 'noto-fonts-full-variable-git' 'noto-fonts-full-variable-slim-git')
pkgver=r5.efa9c9f
pkgrel=1
pkgdesc="Noto fonts git version"
arch=(any)
url="https://github.com/notofonts/"
license=('OFL')
-depends=('noto-fonts-config-files')
makedepends=('git' 'python' 'python-pip' 'python-cairocffi')
-conflicts=(noto-fonts{,-extra,} ttf-croscore)
+conflicts=(noto-fonts{,-extra,})
provides=(noto-fonts{,-extra,})
-source=("git+https://github.com/jopejoe1-aur/noto-fonts" "activate")
-md5sums=('SKIP' '3f4a8c4eeb43639a1d910a6d462ffd0d')
-
-_blocklist=( Arimo test armenian Cousine hanifi-rohingya multani old-hungarian-ui Tinos )
+source=("git+https://github.com/jopejoe1-aur/noto-fonts" "activate"
+ "66-noto-sans.conf" "66-noto-serif.conf" "66-noto-mono.conf"
+ "46-noto-sans.conf" "46-noto-serif.conf" "46-noto-mono.conf")
+sha256sums=('SKIP'
+ '11a256a464d24c66d52c109868cbc5c0e40fe7f125dc7762b862e62af1764fd9'
+ '52684bebf6447be22618d2a04ff37623ec92f9d8ccf6b6f972e5bcbcfee90d69'
+ '4459944b63dc083107280f5d7375c69746bf80a09416a4a4909a100e58e5a33a'
+ '4526289f59654e2a81dc734669a1ae4e416f9a56d0896ec3741c6bf065baf8a8'
+ '83a8faf6a47954075f97a2d555048e2a6689c38603b2ca00150157bf645f4593'
+ 'c94368b24506770767d003e5bcba589a8e402e489c240ee52453bf3ac7e9b5fa'
+ 'f5c09b37280d7569b6c99a78511639be4ae25b8c5406464422fe0421fe13a884')
+
+_blocklist=(Arimo test armenian Cousine hanifi-rohingya multani old-hungarian-ui Tinos)
pkgver() {
cd "${srcdir}/noto-fonts"
@@ -27,46 +37,56 @@ prepare() {
cd "noto-fonts"
git submodule update --init --recursive
-
for font in "${_blocklist[@]}"; do
- rm -rf $font
+ rm -rf "$font"
done
- for dir in */
- do
- cd $dir
- rm -rf "subset-files"
- rm -rf "venv"
- mkdir "subset-files"
- cd "subset-files"
- ln -s "${srcdir}/noto-fonts/latin-greek-cyrillic"
- cd ../..
- done
+ for dir in */; do
+ cd "$dir"
+ rm -rf "subset-files"
+ rm -rf "venv"
+ mkdir "subset-files"
+ cd "subset-files"
+ ln -s "${srcdir}/noto-fonts/latin-greek-cyrillic"
+ cd ../..
+ done
}
build() {
cd "$srcdir/noto-fonts"
- for dir in */
- do
- cd $dir
- if [ -e $srcdir/venv/bin/activate ]; then
- input="$srcdir/noto-fonts/$dir/venv"
- activate=$(cat "$srcdir/activate")
- activate="${activate//§TO_BE_REPLACED/$input}"
- rm $srcdir/venv/bin/activate
- echo "$activate" >> $srcdir/venv/bin/activate
- ln -s "${srcdir}/venv"
- make build
- else
- make build
- mv venv ${srcdir}
- ln -s "${srcdir}/venv"
- fi
- cd ..
- done
+ for dir in */; do
+ cd "$dir"
+ if [ -e "$srcdir/venv/bin/activate" ]; then
+ input="$srcdir/noto-fonts/$dir/venv"
+ activate=$(cat "$srcdir/activate")
+ activate="${activate//§TO_BE_REPLACED/$input}"
+ echo "$activate" > "$srcdir/venv/bin/activate"
+ else
+ python -m pip install --upgrade pip
+ python -m pip install --upgrade virtualenv
+ python -m virtualenv "$srcdir/venv"
+ input="$srcdir/noto-fonts/$dir/venv"
+ activate=$(cat "$srcdir/activate")
+ activate="${activate//§TO_BE_REPLACED/$input}"
+ echo "$activate" > "$srcdir/venv/bin/activate"
+ fi
+ source "$srcdir/venv/bin/activate"
+ python -m pip install --upgrade -r requirements.txt
+ python -m fontmake -o variable --print-preview -m "Master_dev.designspace"
+ deactivate
+ cd ..
+ done
+}
+
+_package() {
+ # Install fontconfig files
+ install -Dm644 "$srcdir"/*.conf -t "$pkgdir"/usr/share/fontconfig/conf.avail/
+ install -d "$pkgdir"/usr/share/fontconfig/conf.default
+ ln -rs "$pkgdir"/usr/share/fontconfig/conf.avail/* "$pkgdir"/usr/share/fontconfig/conf.default
}
package_noto-fonts-hinted-git() {
+ _package
pkgdesc+=' (hinted)'
conflicts+=(noto-fonts-unhinted-git noto-fonts-unhinted-variable-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-git noto-fonts-full-variable-git noto-fonts-full-variable-slim-git)
@@ -75,6 +95,7 @@ package_noto-fonts-hinted-git() {
}
package_noto-fonts-unhinted-git() {
+ _package
pkgdesc+=' (unhinted)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-variable-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-git noto-fonts-full-variable-git noto-fonts-full-variable-slim-git)
@@ -83,6 +104,7 @@ package_noto-fonts-unhinted-git() {
}
package_noto-fonts-unhinted-variable-git() {
+ _package
pkgdesc+=' (unhinted variable)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-git noto-fonts-full-variable-git noto-fonts-full-variable-slim-git)
@@ -91,6 +113,7 @@ package_noto-fonts-unhinted-variable-git() {
}
package_noto-fonts-unhinted-variable-slim-git() {
+ _package
pkgdesc+=' (unhinted variable slim)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-git noto-fonts-unhinted-variable-git noto-fonts-full-git noto-fonts-full-variable-git noto-fonts-full-variable-slim-git)
@@ -99,6 +122,7 @@ package_noto-fonts-unhinted-variable-slim-git() {
}
package_noto-fonts-full-git() {
+ _package
pkgdesc+=' (full)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-git noto-fonts-unhinted-variable-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-variable-git noto-fonts-full-variable-slim-git)
@@ -107,6 +131,7 @@ package_noto-fonts-full-git() {
}
package_noto-fonts-full-variable-git() {
+ _package
pkgdesc+=' (full variable)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-git noto-fonts-unhinted-variable-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-git noto-fonts-full-variable-slim-git)
@@ -115,6 +140,7 @@ package_noto-fonts-full-variable-git() {
}
package_noto-fonts-full-variable-slim-git() {
+ _package
pkgdesc+=' (full variable slim)'
conflicts+=(noto-fonts-hinted-git noto-fonts-unhinted-git noto-fonts-unhinted-variable-git noto-fonts-unhinted-variable-slim-git noto-fonts-full-git noto-fonts-full-variable-git)