New upstream release.
This commit is contained in:
Akira TAGOH
parent
5a062b2ec8
commit
4dc1c1f9ef
1
.gitignore
vendored
1
.gitignore
vendored
@ -25,3 +25,4 @@ fontconfig-2.8.0.tar.gz
|
||||
/fontconfig-2.12.4.tar.bz2
|
||||
/fontconfig-2.12.5.tar.bz2
|
||||
/fontconfig-2.12.6.tar.bz2
|
||||
/fontconfig-2.12.91.tar.bz2
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From b56207a069be2574df455ede0a6ab61f44d5ca2b Mon Sep 17 00:00:00 2001
|
||||
From: Behdad Esfahbod <behdad@behdad.org>
|
||||
Date: Tue, 12 Sep 2017 13:25:46 -0400
|
||||
Subject: [PATCH] Remove stray printf()
|
||||
|
||||
Ouch.
|
||||
---
|
||||
fc-query/fc-query.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
|
||||
index 842a8b6..6cd5abd 100644
|
||||
--- a/fc-query/fc-query.c
|
||||
+++ b/fc-query/fc-query.c
|
||||
@@ -170,7 +170,6 @@ main (int argc, char **argv)
|
||||
FcPattern *pat;
|
||||
|
||||
id = ((instance_num << 16) + face_num);
|
||||
- printf("id %d\n", id);
|
||||
if (FT_New_Face (ftLibrary, argv[i], id, &face))
|
||||
break;
|
||||
num_faces = face->num_faces;
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
Summary: Font configuration and customization library
|
||||
Name: fontconfig
|
||||
Version: 2.12.6
|
||||
Release: 4%{?dist}
|
||||
Version: 2.12.91
|
||||
Release: 1%{?dist}
|
||||
# src/ftglue.[ch] is in Public Domain
|
||||
# src/fccache.c contains Public Domain code
|
||||
# fc-case/CaseFolding.txt is in the UCD
|
||||
@ -16,15 +16,11 @@ Source2: fc-cache
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
|
||||
Patch0: %{name}-sleep-less.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1496761
|
||||
Patch1: %{name}-emoji.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1509790
|
||||
Patch2: %{name}-remove-debug-print-in-fc-query.patch
|
||||
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: freetype-devel >= %{freetype_version}
|
||||
BuildRequires: fontpackages-devel
|
||||
BuildRequires: autoconf automake libtool
|
||||
BuildRequires: autoconf automake libtool gettext
|
||||
BuildRequires: gperf
|
||||
|
||||
Requires: fontpackages-filesystem freetype
|
||||
@ -62,10 +58,7 @@ The fontconfig-devel-doc package contains the documentation files
|
||||
which is useful for developing applications that uses fontconfig.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .sleep-less
|
||||
%patch1 -p1 -b .emoji
|
||||
%patch2 -p1 -b .fc-query
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
# We don't want to rebuild the docs, but we want to install the included ones.
|
||||
@ -157,6 +150,9 @@ HOME=/root /usr/bin/fc-cache -s
|
||||
%doc fontconfig-devel.txt fontconfig-devel
|
||||
|
||||
%changelog
|
||||
* Thu Dec 14 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.91-1
|
||||
- New upstream release.
|
||||
|
||||
* Wed Nov 8 2017 Akira TAGOH <tagoh@redhat.com> - 2.12.6-4
|
||||
- Remove the debug print in fc-query. (#1509790)
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (fontconfig-2.12.6.tar.bz2) = 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
|
||||
SHA512 (fontconfig-2.12.91.tar.bz2) = 755a288e798c6c93acde8307905bef63fcc0cf85d69855334042897e1c26ed089626b1e42d2cfe3de657c623b19dec469b483a75d64502954cc8641290f23301
|
||||
|
||||
Loading…
Reference in New Issue
Block a user