From c7bece02d1365b512aa60d291448930a8888f8d8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 29 2019 15:25:10 +0000 Subject: import freetype-2.8-12.el7_6.1 --- diff --git a/SOURCES/freetype-2.8-2.4.11-API.patch b/SOURCES/freetype-2.8-2.4.11-API.patch index 203e9e4..d92e4de 100644 --- a/SOURCES/freetype-2.8-2.4.11-API.patch +++ b/SOURCES/freetype-2.8-2.4.11-API.patch @@ -41,6 +41,15 @@ FT_ENCODING_MS_BIG5 = FT_ENCODING_BIG5, FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG, FT_ENCODING_MS_JOHAB = FT_ENCODING_JOHAB, +@@ -799,7 +798,7 @@ FT_BEGIN_HEADER + #define ft_encoding_latin_1 FT_ENCODING_ADOBE_LATIN_1 + #define ft_encoding_latin_2 FT_ENCODING_OLD_LATIN_2 + #define ft_encoding_sjis FT_ENCODING_SJIS +-#define ft_encoding_gb2312 FT_ENCODING_PRC ++#define ft_encoding_gb2312 FT_ENCODING_GB2312 + #define ft_encoding_big5 FT_ENCODING_BIG5 + #define ft_encoding_wansung FT_ENCODING_WANSUNG + #define ft_encoding_johab FT_ENCODING_JOHAB --- freetype-2.8/include/freetype/ftcache.h.api 2017-03-30 12:20:23.000000000 +0200 +++ freetype-2.8/include/freetype/ftcache.h 2018-06-04 16:53:29.961331388 +0200 @@ -667,8 +667,8 @@ FT_BEGIN_HEADER diff --git a/SPECS/freetype.spec b/SPECS/freetype.spec index c7e62a0..f7f06f5 100644 --- a/SPECS/freetype.spec +++ b/SPECS/freetype.spec @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.8 -Release: 12%{?dist} +Release: 12%{?dist}.1 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries URL: http://www.freetype.org @@ -228,6 +228,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Thu Nov 22 2018 Marek Kasik - 2.8-12.el7_6.1 +- Fix definition of constant ft_encoding_gb2312 in freetype.h +- Resolves: #1652187 + * Fri Jun 08 2018 Marek Kasik - 2.8-12 - Fix loading of avar tables - Resolves: #1576504