pool/fontconfig
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 227378 from home:sumski:branches:M17N

Browse Source 
Update to 2.11.1

OBS-URL: https://build.opensuse.org/request/show/227378
OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=126
This commit is contained in:
Marguerite Su 2014-03-25 10:59:15 +00:00 committed by Git OBS Bridge
parent fb5e45f9d6
commit 82f3841a18
9 changed files with 62 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch
View File

@ -1,27 +0,0 @@
From 88c90a10646f27f597c2cb91c6a8df71bbf4669f Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Fri, 6 Dec 2013 14:08:08 +0100
Subject: [PATCH 1/2] Fix inversion between Tinos and Cousine in the comment
---
conf.d/30-metric-aliases.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index d0d9ea2..c9ee79f 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -22,8 +22,8 @@ Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fo
================ ====================== ======================= ================= ==============
Arial Liberation Sans Arimo Albany Albany AMT
Arial Narrow Liberation Sans Narrow
-Times New Roman Liberation Serif Cousine Thorndale Thorndale AMT
-Courier New Liberation Mono Tinos Cumberland Cumberland AMT
+Times New Roman Liberation Serif Tinos Thorndale Thorndale AMT
+Courier New Liberation Mono Cousine Cumberland Cumberland AMT
Microsoft fonts: Other fonts:
================ ============
--
1.8.4

81
0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch
View File

@ -1,81 +0,0 @@
From 74b9be6b4030ac1bfd4c20b52bbcdeb66373eaba Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Fri, 6 Dec 2013 14:23:52 +0100
Subject: [PATCH 2/2] Add metric aliases for additional Google ChromeOS fonts
MS fonts Cambria, Symbol and Calibri have compat metrics fonts
from ChromeOS.
---
conf.d/30-metric-aliases.conf | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index c9ee79f..49a9602 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -24,6 +24,9 @@ Arial Liberation Sans Arimo Albany
Arial Narrow Liberation Sans Narrow
Times New Roman Liberation Serif Tinos Thorndale Thorndale AMT
Courier New Liberation Mono Cousine Cumberland Cumberland AMT
+Cambria Caladea
+Calibri Carlito
+Symbol SymbolNeu
Microsoft fonts: Other fonts:
================ ============
@@ -307,7 +310,26 @@ but in an order preferring similar designs first. We do this in three steps:
</default>
</alias>
+ <alias binding="same">
+ <family>Caladea</family>
+ <default>
+ <family>Cambria</family>
+ </default>
+ </alias>
+ <alias binding="same">
+ <family>Carlito</family>
+ <default>
+ <family>Calibri</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>SymbolNeu</family>
+ <default>
+ <family>Symbol</family>
+ </default>
+ </alias>
<!-- Accept the other group as fallback -->
@@ -494,4 +516,25 @@ but in an order preferring similar designs first. We do this in three steps:
</accept>
</alias>
+ <alias binding="same">
+ <family>Cambria</family>
+ <accept>
+ <family>Caladea</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>Calibri</family>
+ <accept>
+ <family>Carlito</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>Symbol</family>
+ <accept>
+ <family>SymbolNeu</family>
+ </accept>
+ </alias>
+
</fontconfig>
--
1.8.4

3
fontconfig-2.11.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467
size 1541382

3
fontconfig-2.11.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
size 1516095

32
fontconfig-crash-bdf.patch
View File

@ -1,32 +0,0 @@
src/fcfreetype.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 80081555fdffea927a53fce2773cfbe9db4c51f0
Author: Akira TAGOH <akira@tagoh.org>
Date: Fri Jan 31 11:10:02 2014 +0900
Fix a crash issue when empty strings are set to the BDF properties
Index: src/fcfreetype.c
===================================================================
--- src/fcfreetype.c.orig 2013-10-11 05:10:18.000000000 +0200
+++ src/fcfreetype.c 2014-01-31 08:40:43.446021821 +0100
@@ -1586,7 +1586,7 @@
}
if (width == -1 &&
FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 &&
- prop.type == BDF_PROPERTY_TYPE_ATOM)
+ prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL)
{
width = FcIsWidth ((FcChar8 *) prop.u.atom);
if (FcDebug () & FC_DBG_SCANV)
@@ -1716,7 +1716,7 @@
/* For PCF fonts, override the computed spacing with the one from
the property */
if(FT_Get_BDF_Property(face, "SPACING", &prop) == 0 &&
- prop.type == BDF_PROPERTY_TYPE_ATOM) {
+ prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL) {
if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C"))
spacing = FC_CHARCELL;
else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M"))

3
fontconfig-doc-2.11.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33953784ec869088670db991be7bcaf19d65ca99f341e688693b823cef8bb0f
size 96932

3
fontconfig-doc-2.11.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5ee0fd8129bb65a8df071ce9054e554a3cc24cf7f12c5da62ce943690555733
size 96753

55
fontconfig.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Mon Mar 24 19:54:56 UTC 2014 - hrvoje.senjan@gmail.com
- Update to 2.11.1
+ do not build test-migration for Win32
+ Fix build issue on Debian/kFreeBSD 7.0
+ Update ax_pthread.m4 to the latest version
+ Fix the dynamic loading issue on NetBSD
+ Use stat() if there are no d_type in struct dirent
+ Fix a build issue on Solaris 10
+ Change the default weight on match to FC_WEIGHT_NORMAL
+ Warn if no <test> nor <edit> elements in <match>
+ Correct DTD
+ Re-scan font directories only when it contains subdirs
+ Fix typo
+ fixed fdo#72086 - Check for gperf in autogen.sh
+ Simplify to validate the availability of posix_fadvise
+ Simplify to validate the availability of scandir
+ Fix a typo
+ Fix a build issue on platforms where doesn't
support readlink()
+ Improve the performance issue on rescanning directories
+ fixed fdo#73686 - confdir is not set correctly
in fontconfig.pc
+ Update zh_hk.orth
+ clean up the unused files
+ Add missing license headers
+ Update the use of autotools' macro
+ Fix a crash issue when empty strings are set to the BDF
properties
+ Add a doc for FcDirCacheRescan
+ Add missing #include <sys/statvfs.h> in fcstat.c
+ Fix incompatible API on AIX with random_r and initstate_r
+ Fallback to lstat() in case the filesystem doesn't support
d_type in struct dirent
+ Update doc to include the version info of `since when'
+ fixed fdo#73291 - poppler does not show fl ligature
+ Add README describes the criteria to add/modify the
orthography files
+ Fix autoconf warning, warning: AC_COMPILE_IFELSE was called
before AC_USE_SYSTEM_EXTENSIONS
+ Leave room for null terminators in arrays
+ Avoid memory leak when NULL path passed to FcStrBuildFilename
+ Avoid null pointer dereference in FcNameParse if malloc fails
+ Bug 72380 - Never drop first font when trimming
+ Fix inversion between Tinos and Cousine in the comment
+ Add metric aliases for additional Google ChromeOS fonts
+ Defaulting <cachedir> to LOCAL_APPDATA_FONTCONFIG_CACHE for
Win32 build
+ fc-cache: --sysroot option takes an argument
- Drop patches from/merged upstream:
0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch,
0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch
and fontconfig-crash-bdf.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 6 16:56:30 UTC 2014 - pgajdos@suse.com Thu Feb 6 16:56:30 UTC 2014 - pgajdos@suse.com

10
fontconfig.spec
View File

@ -48,7 +48,7 @@ Url: http://fontconfig.org/
Obsoletes: fontconfig-64bit Obsoletes: fontconfig-64bit
%endif %endif
Requires: bash Requires: bash
Version: 2.11.0 Version: 2.11.1
Release: 0 Release: 0
Summary: Library for Font Configuration Summary: Library for Font Configuration
License: MIT License: MIT
@ -66,11 +66,6 @@ Source5: local.conf
Patch0: make-check.patch Patch0: make-check.patch
# suse specific # suse specific
Patch1: usr-share-doc-packages.patch Patch1: usr-share-doc-packages.patch
# fix submitted upstream
Patch2: 0001-Fix-inversion-between-Tinos-and-Cousine-in-the-comme.patch
Patch3: 0002-Add-metric-aliases-for-additional-Google-ChromeOS-fo.patch
# upstream patch http://cgit.freedesktop.org/fontconfig/commit/?id=80081555fdffea927a53fce2773cfbe9db4c51f0
Patch4: fontconfig-crash-bdf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02 Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02 Obsoletes: ipa-fonts-config <= 003.02
@ -115,9 +110,6 @@ accepts font patterns and returns the nearest matching font.
%endif %endif
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4
%build %build
# ----- build with automake 1.13 # ----- build with automake 1.13