Backport a patch to change the order of the emoji fonts. (#1496761)
This commit is contained in:
parent
446f303a1d
commit
ce2cb4fb5d
94
fontconfig-emoji.patch
Normal file
94
fontconfig-emoji.patch
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
From b861a2a5b09e06795dea4de6e72447d364b89473 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bastien Nocera <hadess@hadess.net>
|
||||||
|
Date: Thu, 5 Oct 2017 12:17:59 +0200
|
||||||
|
Subject: [PATCH] conf: Prefer system emoji fonts to third-party ones
|
||||||
|
|
||||||
|
Prefer the system provided emoji fonts on systems which provide one,
|
||||||
|
such as Windows, MacOS and Android, even if the Emoji One or Emoji Two
|
||||||
|
fonts are installed.
|
||||||
|
|
||||||
|
This also allows free software OSes such as GNOME to prefer the Emoji
|
||||||
|
One font, which is not used in other OSes and therefore has a unique
|
||||||
|
brand identity, by installing them and only them by default.
|
||||||
|
|
||||||
|
Users can use more capable fonts while Emoji One and Emoji Two catch up
|
||||||
|
by installing a font otherwise already used by another system, such as
|
||||||
|
Google's freely redistributable Noto Emoji font.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1496761
|
||||||
|
---
|
||||||
|
conf.d/45-generic.conf | 16 +++++++++-------
|
||||||
|
conf.d/60-generic.conf | 5 +++--
|
||||||
|
2 files changed, 12 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
|
||||||
|
index f6076bb..791d12d 100644
|
||||||
|
--- a/conf.d/45-generic.conf
|
||||||
|
+++ b/conf.d/45-generic.conf
|
||||||
|
@@ -5,32 +5,34 @@
|
||||||
|
|
||||||
|
<!-- Emoji -->
|
||||||
|
|
||||||
|
+ <!-- System emoji -->
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Emoji Two</family>
|
||||||
|
+ <family>Noto Color Emoji</family> <!-- Google -->
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Emoji One</family>
|
||||||
|
+ <family>Apple Color Emoji</family> <!-- Apple -->
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Noto Color Emoji</family> <!-- Google -->
|
||||||
|
+ <family>Segoe UI Emoji</family> <!-- Microsoft -->
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Apple Color Emoji</family> <!-- Apple -->
|
||||||
|
+ <family>Twitter Color Emoji</family> <!-- Twitter -->
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Segoe UI Emoji</family> <!-- Microsoft -->
|
||||||
|
+ <family>EmojiOne Mozilla</family> <!-- Mozilla -->
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
+ <!-- Third-party emoji -->
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>Twitter Color Emoji</family> <!-- Twitter -->
|
||||||
|
+ <family>Emoji Two</family>
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<alias binding="same">
|
||||||
|
- <family>EmojiOne Mozilla</family> <!-- Mozilla -->
|
||||||
|
+ <family>Emoji One</family>
|
||||||
|
<default><family>emoji</family></default>
|
||||||
|
</alias>
|
||||||
|
<!-- B&W -->
|
||||||
|
diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf
|
||||||
|
index 2a2b809..7985ce9 100644
|
||||||
|
--- a/conf.d/60-generic.conf
|
||||||
|
+++ b/conf.d/60-generic.conf
|
||||||
|
@@ -29,14 +29,15 @@
|
||||||
|
<alias binding="same">
|
||||||
|
<family>emoji</family>
|
||||||
|
<prefer>
|
||||||
|
- <family>Emoji Two</family>
|
||||||
|
- <family>Emoji One</family>
|
||||||
|
<!-- System fonts -->
|
||||||
|
<family>Noto Color Emoji</family> <!-- Google -->
|
||||||
|
<family>Apple Color Emoji</family> <!-- Apple -->
|
||||||
|
<family>Segoe UI Emoji</family> <!-- Microsoft -->
|
||||||
|
<family>Twitter Color Emoji</family> <!-- Twitter -->
|
||||||
|
<family>EmojiOne Mozilla</family> <!-- Mozilla -->
|
||||||
|
+ <!-- Third-Party fonts -->
|
||||||
|
+ <family>Emoji Two</family>
|
||||||
|
+ <family>Emoji One</family>
|
||||||
|
<!-- Non-color -->
|
||||||
|
<family>Noto Emoji</family> <!-- Google -->
|
||||||
|
<family>Android Emoji</family> <!-- Google -->
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
Summary: Font configuration and customization library
|
Summary: Font configuration and customization library
|
||||||
Name: fontconfig
|
Name: fontconfig
|
||||||
Version: 2.12.6
|
Version: 2.12.6
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
# src/ftglue.[ch] is in Public Domain
|
# src/ftglue.[ch] is in Public Domain
|
||||||
# src/fccache.c contains Public Domain code
|
# src/fccache.c contains Public Domain code
|
||||||
# fc-case/CaseFolding.txt is in the UCD
|
# fc-case/CaseFolding.txt is in the UCD
|
||||||
@ -16,6 +16,8 @@ Source2: fc-cache
|
|||||||
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
||||||
Patch0: %{name}-sleep-less.patch
|
Patch0: %{name}-sleep-less.patch
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1496761
|
||||||
|
Patch1: %{name}-emoji.patch
|
||||||
|
|
||||||
BuildRequires: expat-devel
|
BuildRequires: expat-devel
|
||||||
BuildRequires: freetype-devel >= %{freetype_version}
|
BuildRequires: freetype-devel >= %{freetype_version}
|
||||||
@ -60,6 +62,7 @@ which is useful for developing applications that uses fontconfig.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .sleep-less
|
%patch0 -p1 -b .sleep-less
|
||||||
|
%patch1 -p1 -b .emoji
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||||
@ -151,6 +154,9 @@ HOME=/root /usr/bin/fc-cache -s
|
|||||||
%doc fontconfig-devel.txt fontconfig-devel
|
%doc fontconfig-devel.txt fontconfig-devel
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 5 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.6-3
|
||||||
|
- Backport a patch to change the order of the emoji fonts. (#1496761)
|
||||||
|
|
||||||
* Tue Oct 3 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.6-2
|
* Tue Oct 3 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.6-2
|
||||||
- Bump the release to address the upgrade path issue.
|
- Bump the release to address the upgrade path issue.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user