diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -20,6 +20,7 @@ libfreetype.so.6:FT_Atan2 libfreetype.so.6:FT_Attach_File libfreetype.so.6:FT_Attach_Stream +libfreetype.so.6:FT_Bitmap_Blend libfreetype.so.6:FT_Bitmap_Convert libfreetype.so.6:FT_Bitmap_Copy libfreetype.so.6:FT_Bitmap_Done @@ -35,7 +36,9 @@ libfreetype.so.6:FT_Done_FreeType libfreetype.so.6:FT_Done_Glyph libfreetype.so.6:FT_Done_Library +libfreetype.so.6:FT_Done_MM_Var libfreetype.so.6:FT_Done_Size +libfreetype.so.6:FT_Error_String libfreetype.so.6:FT_Face_CheckTrueTypePatents libfreetype.so.6:FT_Face_GetCharVariantIndex libfreetype.so.6:FT_Face_GetCharVariantIsDefault @@ -56,6 +59,7 @@ libfreetype.so.6:FT_Get_CMap_Language_ID libfreetype.so.6:FT_Get_Char_Index libfreetype.so.6:FT_Get_Charmap_Index +libfreetype.so.6:FT_Get_Color_Glyph_Layer libfreetype.so.6:FT_Get_FSType_Flags libfreetype.so.6:FT_Get_First_Char libfreetype.so.6:FT_Get_Font_Format @@ -65,6 +69,7 @@ libfreetype.so.6:FT_Get_Kerning libfreetype.so.6:FT_Get_MM_Blend_Coordinates libfreetype.so.6:FT_Get_MM_Var +libfreetype.so.6:FT_Get_MM_WeightVector libfreetype.so.6:FT_Get_Module libfreetype.so.6:FT_Get_Multi_Master libfreetype.so.6:FT_Get_Name_Index @@ -84,6 +89,7 @@ libfreetype.so.6:FT_Get_SubGlyph_Info libfreetype.so.6:FT_Get_Track_Kerning libfreetype.so.6:FT_Get_TrueType_Engine_Type +libfreetype.so.6:FT_Get_Var_Axis_Flags libfreetype.so.6:FT_Get_Var_Blend_Coordinates libfreetype.so.6:FT_Get_Var_Design_Coordinates libfreetype.so.6:FT_Get_WinFNT_Header @@ -102,6 +108,7 @@ libfreetype.so.6:FT_Init_FreeType libfreetype.so.6:FT_Library_SetLcdFilter libfreetype.so.6:FT_Library_SetLcdFilterWeights +libfreetype.so.6:FT_Library_SetLcdGeometry libfreetype.so.6:FT_Library_Version libfreetype.so.6:FT_List_Add libfreetype.so.6:FT_List_Finalize @@ -118,6 +125,7 @@ libfreetype.so.6:FT_MulDiv libfreetype.so.6:FT_MulFix libfreetype.so.6:FT_New_Face +libfreetype.so.6:FT_New_Glyph libfreetype.so.6:FT_New_Library libfreetype.so.6:FT_New_Memory_Face libfreetype.so.6:FT_New_Size @@ -128,7 +136,6 @@ libfreetype.so.6:FT_Outline_Copy libfreetype.so.6:FT_Outline_Decompose libfreetype.so.6:FT_Outline_Done -libfreetype.so.6:FT_Outline_Done_Internal libfreetype.so.6:FT_Outline_Embolden libfreetype.so.6:FT_Outline_EmboldenXY libfreetype.so.6:FT_Outline_GetInsideBorder @@ -138,11 +145,13 @@ libfreetype.so.6:FT_Outline_Get_CBox libfreetype.so.6:FT_Outline_Get_Orientation libfreetype.so.6:FT_Outline_New -libfreetype.so.6:FT_Outline_New_Internal libfreetype.so.6:FT_Outline_Render libfreetype.so.6:FT_Outline_Reverse libfreetype.so.6:FT_Outline_Transform libfreetype.so.6:FT_Outline_Translate +libfreetype.so.6:FT_Palette_Data_Get +libfreetype.so.6:FT_Palette_Select +libfreetype.so.6:FT_Palette_Set_Foreground_Color libfreetype.so.6:FT_Property_Get libfreetype.so.6:FT_Property_Set libfreetype.so.6:FT_Reference_Face @@ -159,6 +168,8 @@ libfreetype.so.6:FT_Set_Default_Properties libfreetype.so.6:FT_Set_MM_Blend_Coordinates libfreetype.so.6:FT_Set_MM_Design_Coordinates +libfreetype.so.6:FT_Set_MM_WeightVector +libfreetype.so.6:FT_Set_Named_Instance libfreetype.so.6:FT_Set_Pixel_Sizes libfreetype.so.6:FT_Set_Renderer libfreetype.so.6:FT_Set_Transform diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -20,6 +20,7 @@ libfreetype.so.6:FT_Atan2 libfreetype.so.6:FT_Attach_File libfreetype.so.6:FT_Attach_Stream +libfreetype.so.6:FT_Bitmap_Blend libfreetype.so.6:FT_Bitmap_Convert libfreetype.so.6:FT_Bitmap_Copy libfreetype.so.6:FT_Bitmap_Done @@ -35,7 +36,9 @@ libfreetype.so.6:FT_Done_FreeType libfreetype.so.6:FT_Done_Glyph libfreetype.so.6:FT_Done_Library +libfreetype.so.6:FT_Done_MM_Var libfreetype.so.6:FT_Done_Size +libfreetype.so.6:FT_Error_String libfreetype.so.6:FT_Face_CheckTrueTypePatents libfreetype.so.6:FT_Face_GetCharVariantIndex libfreetype.so.6:FT_Face_GetCharVariantIsDefault @@ -56,6 +59,7 @@ libfreetype.so.6:FT_Get_CMap_Language_ID libfreetype.so.6:FT_Get_Char_Index libfreetype.so.6:FT_Get_Charmap_Index +libfreetype.so.6:FT_Get_Color_Glyph_Layer libfreetype.so.6:FT_Get_FSType_Flags libfreetype.so.6:FT_Get_First_Char libfreetype.so.6:FT_Get_Font_Format @@ -65,6 +69,7 @@ libfreetype.so.6:FT_Get_Kerning libfreetype.so.6:FT_Get_MM_Blend_Coordinates libfreetype.so.6:FT_Get_MM_Var +libfreetype.so.6:FT_Get_MM_WeightVector libfreetype.so.6:FT_Get_Module libfreetype.so.6:FT_Get_Multi_Master libfreetype.so.6:FT_Get_Name_Index @@ -84,6 +89,7 @@ libfreetype.so.6:FT_Get_SubGlyph_Info libfreetype.so.6:FT_Get_Track_Kerning libfreetype.so.6:FT_Get_TrueType_Engine_Type +libfreetype.so.6:FT_Get_Var_Axis_Flags libfreetype.so.6:FT_Get_Var_Blend_Coordinates libfreetype.so.6:FT_Get_Var_Design_Coordinates libfreetype.so.6:FT_Get_WinFNT_Header @@ -102,6 +108,7 @@ libfreetype.so.6:FT_Init_FreeType libfreetype.so.6:FT_Library_SetLcdFilter libfreetype.so.6:FT_Library_SetLcdFilterWeights +libfreetype.so.6:FT_Library_SetLcdGeometry libfreetype.so.6:FT_Library_Version libfreetype.so.6:FT_List_Add libfreetype.so.6:FT_List_Finalize @@ -118,6 +125,7 @@ libfreetype.so.6:FT_MulDiv libfreetype.so.6:FT_MulFix libfreetype.so.6:FT_New_Face +libfreetype.so.6:FT_New_Glyph libfreetype.so.6:FT_New_Library libfreetype.so.6:FT_New_Memory_Face libfreetype.so.6:FT_New_Size @@ -128,7 +136,6 @@ libfreetype.so.6:FT_Outline_Copy libfreetype.so.6:FT_Outline_Decompose libfreetype.so.6:FT_Outline_Done -libfreetype.so.6:FT_Outline_Done_Internal libfreetype.so.6:FT_Outline_Embolden libfreetype.so.6:FT_Outline_EmboldenXY libfreetype.so.6:FT_Outline_GetInsideBorder @@ -138,11 +145,13 @@ libfreetype.so.6:FT_Outline_Get_CBox libfreetype.so.6:FT_Outline_Get_Orientation libfreetype.so.6:FT_Outline_New -libfreetype.so.6:FT_Outline_New_Internal libfreetype.so.6:FT_Outline_Render libfreetype.so.6:FT_Outline_Reverse libfreetype.so.6:FT_Outline_Transform libfreetype.so.6:FT_Outline_Translate +libfreetype.so.6:FT_Palette_Data_Get +libfreetype.so.6:FT_Palette_Select +libfreetype.so.6:FT_Palette_Set_Foreground_Color libfreetype.so.6:FT_Property_Get libfreetype.so.6:FT_Property_Set libfreetype.so.6:FT_Reference_Face @@ -159,6 +168,8 @@ libfreetype.so.6:FT_Set_Default_Properties libfreetype.so.6:FT_Set_MM_Blend_Coordinates libfreetype.so.6:FT_Set_MM_Design_Coordinates +libfreetype.so.6:FT_Set_MM_WeightVector +libfreetype.so.6:FT_Set_Named_Instance libfreetype.so.6:FT_Set_Pixel_Sizes libfreetype.so.6:FT_Set_Renderer libfreetype.so.6:FT_Set_Transform diff --git a/files/0001-modules-Enable-gxvalid-otvalid.patch b/files/0001-modules-Enable-gxvalid-otvalid.patch --- a/files/0001-modules-Enable-gxvalid-otvalid.patch +++ b/files/0001-modules-Enable-gxvalid-otvalid.patch @@ -9,27 +9,27 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.cfg b/modules.cfg -index f30049c..7b8e50f 100644 ---- a/modules.cfg -+++ b/modules.cfg -@@ -120,7 +120,7 @@ AUX_MODULES += cache - # TrueType GX/AAT table validation. Needs ftgxval.c below. +index dc6c8d4..2ab1450 100644 +---- a/modules.cfg +-+++ b/modules.cfg +@@ -111,7 +111,7 @@ AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs `ftgxval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid - + # Support for streams compressed with gzip (files with suffix .gz). # -@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 - # OpenType table validation. Needs ftotval.c below. +@@ -130,7 +130,7 @@ AUX_MODULES += bzip2 + + # OpenType table validation. Needs `ftotval.c' below. # - # No FT_CONFIG_OPTION_PIC support. -# AUX_MODULES += otvalid +AUX_MODULES += otvalid # Auxiliary PostScript driver component to share common code. # -- -2.11.0 +2.24.1 diff --git a/files/0002-config-Enabel-subpixel-rendering-infinality-engine.patch b/files/0002-config-Enabel-subpixel-rendering-infinality-engine.patch --- a/files/0002-config-Enabel-subpixel-rendering-infinality-engine.patch +++ b/files/0002-config-Enabel-subpixel-rendering-infinality-engine.patch @@ -9,29 +9,29 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h -index 90c123e..2a6d778 100644 +index 12f47a8..dd47603 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h -@@ -122,7 +122,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ +@@ -126,7 +126,7 @@ FT_BEGIN_HEADER + * macro is not defined, FreeType offers alternative LCD rendering + * technology that produces excellent output without LCD filtering. + */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - /*************************************************************************/ -@@ -675,8 +675,8 @@ FT_BEGIN_HEADER - /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ - /* */ + /************************************************************************** +@@ -658,8 +658,8 @@ FT_BEGIN_HEADER + * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx + */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ -+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ ++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ +#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) - /*************************************************************************/ + /************************************************************************** -- -2.11.0 +2.24.1 diff --git a/files/0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch b/files/0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch --- a/files/0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch +++ b/files/0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch @@ -18,7 +18,7 @@ 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c -index ed3be2d..fbd86a9 100644 +index e4775a5..dad7769 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -36,6 +36,8 @@ @@ -27,10 +27,10 @@ +#include + - /*************************************************************************/ - /* */ - /* The macro FT_COMPONENT is used in trace mode. It is an implicit */ -@@ -1287,12 +1289,24 @@ + /************************************************************************** + * + * The macro FT_COMPONENT is used in trace mode. It is an implicit +@@ -1415,12 +1417,24 @@ TT_Driver driver = (TT_Driver)ttdriver; @@ -53,10 +53,10 @@ #endif #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL - driver->interpreter_version = TT_INTERPRETER_VERSION_40; -+ driver->interpreter_version = enable_subpixel == TRUE ? TT_INTERPRETER_VERSION_40 : TT_INTERPRETER_VERSION_35; ++ driver->interpreter_version = enable_subpixel == TRUE ? TT_INTERPRETER_VERSION_40 : TT_INTERPRETER_VERSION_35; #endif #else /* !TT_USE_BYTECODE_INTERPRETER */ -- -2.11.0 +2.24.1 diff --git a/files/security/cve-2018-6942.patch b/files/security/cve-2018-6942.patch deleted file mode 100644 --- a/files/security/cve-2018-6942.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 29c759284e305ec428703c9a5831d0b1fc3497ef Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Sat, 27 Jan 2018 14:43:43 +0100 -Subject: * src/truetype/ttinterp.c (Ins_GETVARIATION): Avoid NULL reference. - -Reported as - - https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5736 - -(Changelog edit has been removed) ---- - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index d855aaa..551f14a 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7532,8 +7532,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; -+ } - } - - --- -cgit v1.0-41-gc330 diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,3 @@ 0001-modules-Enable-gxvalid-otvalid.patch 0002-config-Enabel-subpixel-rendering-infinality-engine.patch 0003-truetype-Only-enable-subpixel-rendering-when-a-speci.patch -security/cve-2018-6942.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : freetype2 -version : 2.8 -release : 26 +version : 2.10.1 +release : 27 source : - - https://download.savannah.gnu.org/releases/freetype/freetype-2.8.tar.gz : 33a28fabac471891d0523033e99c0005b95e5618dc8ffa7fa47f9dadcacb1c9b -license : GPL-3.0 + - https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz : 3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110 +license : GPL-2.0-or-later summary : Font rendering library component : desktop.library description: | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,15 +2,15 @@ freetype2 - Joey Riches - josephriches@gmail.com + Fernando Monteiro + fr02monteiro@gmail.com GPL-3.0 desktop.library Font rendering library The FreeType2 package contains a library which allows applications to properly render TrueType fonts. - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus freetype2 @@ -20,7 +20,7 @@ desktop.library /usr/lib64/libfreetype.so.6 - /usr/lib64/libfreetype.so.6.14.0 + /usr/lib64/libfreetype.so.6.17.1 @@ -30,11 +30,11 @@ emul32 - freetype2 + freetype2 /usr/lib32/libfreetype.so.6 - /usr/lib32/libfreetype.so.6.14.0 + /usr/lib32/libfreetype.so.6.17.1 @@ -44,8 +44,8 @@ programming.devel - freetype2-32bit - freetype2-devel + freetype2-32bit + freetype2-devel /usr/lib32/libfreetype.so @@ -59,7 +59,7 @@ programming.devel - freetype2 + freetype2 /usr/bin/freetype-config @@ -70,15 +70,15 @@ /usr/include/freetype2/freetype/config/ftstdlib.h /usr/include/freetype2/freetype/freetype.h /usr/include/freetype2/freetype/ftadvanc.h - /usr/include/freetype2/freetype/ftautoh.h /usr/include/freetype2/freetype/ftbbox.h /usr/include/freetype2/freetype/ftbdf.h /usr/include/freetype2/freetype/ftbitmap.h /usr/include/freetype2/freetype/ftbzip2.h /usr/include/freetype2/freetype/ftcache.h - /usr/include/freetype2/freetype/ftcffdrv.h /usr/include/freetype2/freetype/ftchapters.h /usr/include/freetype2/freetype/ftcid.h + /usr/include/freetype2/freetype/ftcolor.h + /usr/include/freetype2/freetype/ftdriver.h /usr/include/freetype2/freetype/fterrdef.h /usr/include/freetype2/freetype/fterrors.h /usr/include/freetype2/freetype/ftfntfmt.h @@ -97,7 +97,7 @@ /usr/include/freetype2/freetype/ftmoderr.h /usr/include/freetype2/freetype/ftotval.h /usr/include/freetype2/freetype/ftoutln.h - /usr/include/freetype2/freetype/ftpcfdrv.h + /usr/include/freetype2/freetype/ftparams.h /usr/include/freetype2/freetype/ftpfr.h /usr/include/freetype2/freetype/ftrender.h /usr/include/freetype2/freetype/ftsizes.h @@ -106,14 +106,12 @@ /usr/include/freetype2/freetype/ftsynth.h /usr/include/freetype2/freetype/ftsystem.h /usr/include/freetype2/freetype/fttrigon.h - /usr/include/freetype2/freetype/ftttdrv.h /usr/include/freetype2/freetype/fttypes.h /usr/include/freetype2/freetype/ftwinfnt.h /usr/include/freetype2/freetype/t1tables.h /usr/include/freetype2/freetype/ttnameid.h /usr/include/freetype2/freetype/tttables.h /usr/include/freetype2/freetype/tttags.h - /usr/include/freetype2/freetype/ttunpat.h /usr/include/freetype2/ft2build.h /usr/lib64/libfreetype.so /usr/lib64/pkgconfig/freetype2.pc @@ -127,19 +125,19 @@ The FreeType2 package contains a library which allows applications to properly render TrueType fonts. - freetype2 + freetype2 /usr/share/fonts/enable_subpixel_rendering - - 2018-07-11 - 2.8 + + 2020-01-04 + 2.10.1 Packaging update - Joey Riches - josephriches@gmail.com + Fernando Monteiro + fr02monteiro@gmail.com \ No newline at end of file