From 5034d05fdfae9be407f7ffb6823929174bb9c11d Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 25 May 2018 14:32:50 +0200 Subject: [PATCH] Update to 2.9.1 Modify/remove patches as needed Resolves: #1574125 --- .gitignore | 3 +++ freetype-2.2.1-enable-valid.patch | 4 ++-- freetype-2.8-getvariation.patch | 39 ------------------------------- freetype.spec | 17 ++++++++------ sources | 6 ++--- 5 files changed, 18 insertions(+), 51 deletions(-) delete mode 100644 freetype-2.8-getvariation.patch diff --git a/.gitignore b/.gitignore index 42f0d14..1467bcf 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ ft2demos-2.4.2.tar.bz2 /freetype-2.9.tar.bz2 /freetype-doc-2.9.tar.bz2 /ft2demos-2.9.tar.bz2 +/freetype-2.9.1.tar.bz2 +/freetype-doc-2.9.1.tar.bz2 +/ft2demos-2.9.1.tar.bz2 diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch index 21d80da..d924705 100644 --- a/freetype-2.2.1-enable-valid.patch +++ b/freetype-2.2.1-enable-valid.patch @@ -1,7 +1,7 @@ --- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 +++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ - # TrueType GX/AAT table validation. Needs ftgxval.c below. + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid @@ -10,7 +10,7 @@ # Support for streams compressed with gzip (files with suffix .gz). # @@ -124,7 +124,7 @@ - # OpenType table validation. Needs ftotval.c below. + # OpenType table validation. Needs `ftotval.c' below. # # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid diff --git a/freetype-2.8-getvariation.patch b/freetype-2.8-getvariation.patch deleted file mode 100644 index 7e0ecf9..0000000 --- a/freetype-2.8-getvariation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sat, 27 Jan 2018 14:43:43 +0100 -Subject: [PATCH] * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL - reference. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 ---- - src/truetype/ttinterp.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index d855aaaa9..551f14a2e 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7470,8 +7470,16 @@ - return; - } - -- for ( i = 0; i < num_axes; i++ ) -- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ if ( coords ) -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ } -+ else -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = 0; -+ } - } - - --- -2.14.3 - diff --git a/freetype.spec b/freetype.spec index f16bbf2..282ba28 100644 --- a/freetype.spec +++ b/freetype.spec @@ -6,7 +6,7 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.9 +Version: 2.9.1 Release: 1%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement Group: System Environment/Libraries @@ -27,9 +27,7 @@ Patch3: freetype-2.6.5-libtool.patch Patch4: freetype-2.8-multilib.patch -Patch5: freetype-2.8-getvariation.patch - -Patch6: freetype-2.9-ftsmooth.patch +Patch5: freetype-2.9-ftsmooth.patch BuildRequires: libX11-devel BuildRequires: libpng-devel @@ -91,8 +89,7 @@ popd %patch3 -p1 -b .libtool %patch4 -p1 -b .multilib -%patch5 -p1 -b .getvariation -%patch6 -p1 -b .ftsmooth +%patch5 -p1 -b .ftsmooth %build @@ -100,6 +97,7 @@ popd --with-zlib=yes \ --with-bzip2=yes \ --with-png=yes \ + --enable-freetype-config \ --with-harfbuzz=no sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool @@ -148,7 +146,7 @@ mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \ $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h -# Don't package static a or .la files +# Don't package static .a or .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} @@ -204,6 +202,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri May 25 2018 Marek Kasik - 2.9.1-1 +- Update to 2.9.1 +- Modify/remove patches as needed +- Resolves: #1574125 + * Tue Mar 20 2018 Marek Kasik - 2.9-1 - Update to 2.9 - Add/modify/remove patches as needed diff --git a/sources b/sources index b56f9b1..231fa83 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (freetype-2.9.tar.bz2) = 28465f3453baf9a187529432118389de8f1b85273c9fb787d2c8f0feee8ab64b387ddd936b4e67ec58dcf71e33884e7e25f01169b737824221ab143839a9161a -SHA512 (freetype-doc-2.9.tar.bz2) = 0ffd38541f8fd0ae6efb97025bb585209580b964d632e15c66944bc2549e2b0e6c375a141df5061621e8c32eeaed017834530169addc4daa2e83399f88efde2f -SHA512 (ft2demos-2.9.tar.bz2) = 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1 +SHA512 (freetype-2.9.1.tar.bz2) = 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708 +SHA512 (freetype-doc-2.9.1.tar.bz2) = 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4 +SHA512 (ft2demos-2.9.1.tar.bz2) = 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46