[arch-commits] Commit in ttf-joypixels/trunk (3 files)
Maxim Baz
maximbaz at archlinux.org
Thu Apr 2 15:00:55 UTC 2020
Date: Thursday, April 2, 2020 @ 15:00:54
Author: maximbaz
Revision: 609605
upgpkg: ttf-joypixels 5.5.0-3
Modified:
ttf-joypixels/trunk/PKGBUILD
ttf-joypixels/trunk/ttf-joypixels.install
Deleted:
ttf-joypixels/trunk/75-joypixels.conf
-----------------------+
75-joypixels.conf | 182 ------------------------------------------------
PKGBUILD | 6 -
ttf-joypixels.install | 20 ++---
3 files changed, 9 insertions(+), 199 deletions(-)
Deleted: 75-joypixels.conf
===================================================================
--- 75-joypixels.conf 2020-04-02 14:44:52 UTC (rev 609604)
+++ 75-joypixels.conf 2020-04-02 15:00:54 UTC (rev 609605)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
- <!--
- Treat this file as a reference and modify as necessary if you are not satisfied with the results.
-
-
- This config attempts to guarantee that colorful emojis from JoyPixels will be displayed,
- no matter how badly the apps and websites are written.
-
- It uses a few different tricks, some of which introduce conflicts with other fonts.
- -->
-
-
- <!--
- This adds a generic family 'emoji',
- aimed for apps that don't specify specific font family for rendering emojis.
- -->
- <match target="pattern">
- <test qual="any" name="family"><string>emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <!--
- This adds JoyPixels as a final fallback font for the default font families.
- In this case, JoyPixels will be selected if and only if no other font can provide a given symbol.
-
- Note that usually other fonts will have some glyphs available (e.g. Symbola or DejaVu fonts),
- causing some emojis to be rendered in black-and-white.
- -->
- <match target="pattern">
- <test name="family"><string>sans</string></test>
- <edit name="family" mode="append"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test name="family"><string>serif</string></test>
- <edit name="family" mode="append"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test name="family"><string>sans-serif</string></test>
- <edit name="family" mode="append"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test name="family"><string>monospace</string></test>
- <edit name="family" mode="append"><string>JoyPixels</string></edit>
- </match>
-
- <!--
- If other fonts contain emoji glyphs, they could interfere and make some emojis rendered in wrong font (often in black-and-white).
- For example, DejaVu Sans contains black-and-white emojis, which we can remove using the following trick:
- -->
- <match target="scan">
- <test name="family" compare="contains">
- <string>DejaVu</string>
- </test>
- <edit name="charset" mode="assign" binding="same">
- <minus>
- <name>charset</name>
- <charset>
- <range>
- <int>0x2763</int>
- <int>0x2764</int>
- </range>
- <range>
- <int>0x1f600</int>
- <int>0x1f640</int>
- </range>
- </charset>
- </minus>
- </edit>
- </match>
-
- <!--
- Recognize legacy ways of writing JoyPixels family name.
- -->
- <match target="pattern">
- <test qual="any" name="family"><string>EmojiOne</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Emoji One</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>EmojiOne Color</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>EmojiOne Mozilla</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <!--
- Use JoyPixels when other popular fonts are being specifically requested.
-
- It is quite common that websites would only request Apple and Google emoji fonts.
- These aliases will make JoyPixels be selected in such cases to provide good-looking emojis.
-
- This obviously conflicts with other emoji fonts if you have them installed.
- -->
- <match target="pattern">
- <test qual="any" name="family"><string>Apple Color Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Segoe UI Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Segoe UI Symbol</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Noto Color Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>NotoColorEmoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Android Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Noto Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Twitter Color Emoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Twemoji</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Twemoji Mozilla</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>TwemojiMozilla</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>EmojiTwo</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Emoji Two</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>EmojiSymbols</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-
- <match target="pattern">
- <test qual="any" name="family"><string>Symbola</string></test>
- <edit name="family" mode="assign" binding="same"><string>JoyPixels</string></edit>
- </match>
-</fontconfig>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-02 14:44:52 UTC (rev 609604)
+++ PKGBUILD 2020-04-02 15:00:54 UTC (rev 609605)
@@ -2,28 +2,24 @@
pkgname=ttf-joypixels
pkgver=5.5.0
-pkgrel=2
+pkgrel=3
pkgdesc='Emoji as a Service (formerly EmojiOne)'
url='https://www.joypixels.com/download'
arch=('any')
license=('custom')
-depends=('fontconfig')
provides=('emoji-font')
conflicts=('ttf-emojione')
replaces=('ttf-emojione')
install="${pkgname}.install"
source=("joypixels-android-${pkgver}.ttf::https://cdn.joypixels.com/arch-linux/font/${pkgver}/joypixels-android.ttf"
- '75-joypixels.conf'
"license-free-${pkgver}-${pkgrel}.pdf::https://cdn.joypixels.com/arch-linux/license/free-license.pdf"
"license-appendix-${pkgver}-${pkgrel}.pdf::https://cdn.joypixels.com/arch-linux/appendix/joypixels-license-appendix.pdf")
sha256sums=('4b463fc80a6cd755baf69a33d9cdf12525fd02e81ec66f366736db0928287970'
- '99eccc311e014407fbe82b1474533ae48635bb5505e7e06abad845ab62a024ff'
'c4a17634bfebd5c1b74d9a02a1d981f8fcf6b1737162696cad7bfab161d8dbb3'
'05084e4ddbbb0c241bb0ff4e307853a9e6236fa1c617b7cba44af31b6bfc5e2d')
package() {
install -Dm644 "joypixels-android-${pkgver}.ttf" "${pkgdir}/usr/share/fonts/${pkgname#ttf-}/JoyPixels.ttf"
- install -Dm644 -t "${pkgdir}/etc/fonts/conf.avail" 75-joypixels.conf
install -Dm644 "license-free-${pkgver}-${pkgrel}.pdf" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf"
install -Dm644 "license-appendix-${pkgver}-${pkgrel}.pdf" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.appendix.pdf"
}
Modified: ttf-joypixels.install
===================================================================
--- ttf-joypixels.install 2020-04-02 14:44:52 UTC (rev 609604)
+++ ttf-joypixels.install 2020-04-02 15:00:54 UTC (rev 609605)
@@ -1,13 +1,9 @@
-post_install() {
- echo
- echo " See /etc/fonts/conf.avail/75-joypixels.conf for how to enforce rendering emojis via JoyPixels"
- echo " It contains various techniques, some of which can cause issues like rendering numbers as emojis"
- echo " Copy the file to /etc/fonts/conf.d/ and modify as needed to make it work for your own setup."
- echo
+post_upgrade() {
+ conf="/etc/fonts/conf.d/75-joypixels.conf"
+ if [ -L "$conf" -a ! -e "$conf" ]; then
+ echo
+ echo " 75-joypixels.conf is no longer provided by this package, see FS#66080"
+ echo " Remember to update your $conf"
+ echo
+ fi
}
-
-post_remove() {
- echo
- echo " Make sure to remove /etc/fonts/conf.d/75-joypixels.conf if you created it earlier"
- echo
-}
More information about the arch-commits
mailing list