summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfelix2017-01-02 15:00:59 +0100
committerfelix2017-01-02 15:00:59 +0100
commit47779b78e5cb0a89861d175f01297c436c14385f (patch)
treecab6ecd00b05ca1194ff984d6d09fe0d35870706
parent1368f2b253ea545883f00e5f300f346d6ac56493 (diff)
downloadaur-47779b78e5cb0a89861d175f01297c436c14385f.tar.gz
Fold CSUR variant under Unifont
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--fontconfig-upper.conf17
3 files changed, 14 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 992ecab5a6f3..0c7651c221eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = unifont
sha512sums = 767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988
sha512sums = SKIP
sha512sums = cb3e2dd2a7811b5b45bc6c01248688325279ac098da3d4064fbcbf88b60008beaf0c8500a8629b1a71692c2da0bfedba943b59695b57a293537e66ca3deca424
- sha512sums = 4eb2703bea9af264a8beac2f7605666f7a96a7a36a06dcd4357ad77c99378d99a266aeb54b79bd14a7718a3ceddd8a44b2d4d44e442c02ff4e6cb6f4035cd6a8
+ sha512sums = dfbbcc9b81591471562431f6f6742dea2b98ea3095010ed821f05f900616ea6ceab3715da569a1c894715568387b7d35125e7a796ac6d859a0ba63f1ea24a65c
sha512sums = 408162c01ed2a0591ab81e1810db0c258a3b5db072ce7ea40924491797ddd0f15162b3ec01cfaa9e7adb901226610090cd5927738a1360ddadd572f7e732c0eb
pkgname = psf-unifont
diff --git a/PKGBUILD b/PKGBUILD
index 4a0b4f712258..28cb3a2953ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ sha512sums=(
'767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988'
'SKIP'
'cb3e2dd2a7811b5b45bc6c01248688325279ac098da3d4064fbcbf88b60008beaf0c8500a8629b1a71692c2da0bfedba943b59695b57a293537e66ca3deca424'
- '4eb2703bea9af264a8beac2f7605666f7a96a7a36a06dcd4357ad77c99378d99a266aeb54b79bd14a7718a3ceddd8a44b2d4d44e442c02ff4e6cb6f4035cd6a8'
+ 'dfbbcc9b81591471562431f6f6742dea2b98ea3095010ed821f05f900616ea6ceab3715da569a1c894715568387b7d35125e7a796ac6d859a0ba63f1ea24a65c'
'408162c01ed2a0591ab81e1810db0c258a3b5db072ce7ea40924491797ddd0f15162b3ec01cfaa9e7adb901226610090cd5927738a1360ddadd572f7e732c0eb'
)
validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <com dot unifoundry at unifoundry>
@@ -102,8 +102,6 @@ package_ttf-unifont() {
"${pkgdir}${_ttfdir}/unifont_sample.ttf"
install -D -m0644 "unifont_upper-${pkgver}.ttf" \
"${pkgdir}${_ttfdir}/unifont_upper.ttf"
-# install -D -m0644 "unifont_upper_csur-${pkgver}.ttf" \
-# "${pkgdir}${_ttfdir}/unifont_upper_csur.ttf"
cd "$srcdir"
install -D -m0644 fontconfig-noaa.conf \
diff --git a/fontconfig-upper.conf b/fontconfig-upper.conf
index d9a5d18f7b62..2a9948d59d47 100644
--- a/fontconfig-upper.conf
+++ b/fontconfig-upper.conf
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
- <!-- this file makes fontconfig consider "Unifont" and "Unifont Upper" parts of the same font -->
+ <!-- this file makes fontconfig consider "Unifont", "Unifont Upper" and "Unifont CSUR" parts of the same font -->
<match target="scan">
<test name="file" compare="contains">
@@ -20,13 +20,13 @@
<match target="scan">
<test name="file" compare="contains">
- <string>unifont_upper_csur.ttf</string>
+ <string>unifont_csur.ttf</string>
</test>
<edit name="family">
- <string>Unifont CSUR</string>
+ <string>Unifont</string>
</edit>
<edit name="fullname">
- <string>Unifont CSUR</string>
+ <string>Unifont</string>
</edit>
<edit name="fontversion">
<int>8</int>
@@ -41,9 +41,16 @@
</alias>
<alias binding="same">
+ <family>Unifont CSUR</family>
+ <accept>
+ <family>Unifont</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
<family>Unifont Upper CSUR</family>
<accept>
- <family>Unifont CSUR</family>
+ <family>Unifont</family>
</accept>
</alias>
</fontconfig>