diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-02-20 13:06:13 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-02-20 17:13:44 +0100 |
| commit | 7d352599ef3c6e38b3ba21ffbf3ebab3e060a6f8 (patch) | |
| tree | df53f643b1fb5c8a75091410f0f5c34db4afe975 /external | |
| parent | 77d5795f9e79a996fa6ee8153f7bc565c4440b02 (diff) | |
freetype: upgrade to release 2.9.1
Fixes CVE-2018-6942.
Remove freetype-msvc-disable-sse2.patch.1 (doesn't apply and freetype is
only used on Android).
Change-Id: Ia89329f758a077c1493cdea45f99e5f58d1ef265
Reviewed-on: https://gerrit.libreoffice.org/68087
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/UnpackedTarball_freetype.mk | 1 | ||||
| -rw-r--r-- | external/freetype/freetype-msvc-disable-sse2.patch.1 | 37 |
2 files changed, 0 insertions, 38 deletions
diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk index 847ae6f4e5d5..6f724d1776fc 100644 --- a/external/freetype/UnpackedTarball_freetype.mk +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freet $(eval $(call gb_UnpackedTarball_add_patches,freetype,\ external/freetype/freetype-2.6.5.patch.1 \ - external/freetype/freetype-msvc-disable-sse2.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/freetype-msvc-disable-sse2.patch.1 b/external/freetype/freetype-msvc-disable-sse2.patch.1 deleted file mode 100644 index ba6ff4f011c4..000000000000 --- a/external/freetype/freetype-msvc-disable-sse2.patch.1 +++ /dev/null @@ -1,37 +0,0 @@ -diff -up freetype/builds/windows/vc2010/freetype.vcxproj.dt freetype/builds/windows/vc2010/freetype.vcxproj ---- freetype/builds/windows/vc2010/freetype.vcxproj.dt 2017-02-01 22:49:01.394494374 +0100 -+++ freetype/builds/windows/vc2010/freetype.vcxproj 2017-02-01 22:49:22.392286704 +0100 -@@ -392,7 +392,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <WholeProgramOptimization>false</WholeProgramOptimization>
-- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <FloatingPointExceptions>false</FloatingPointExceptions>
- <CreateHotpatchableImage>false</CreateHotpatchableImage>
- <CompileAsManaged>false</CompileAsManaged>
-@@ -472,7 +472,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <WholeProgramOptimization>false</WholeProgramOptimization>
-- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <FloatingPointExceptions>false</FloatingPointExceptions>
- <CreateHotpatchableImage>false</CreateHotpatchableImage>
- <RuntimeTypeInfo>false</RuntimeTypeInfo>
-@@ -554,7 +554,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <WholeProgramOptimization>false</WholeProgramOptimization>
-- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <FloatingPointExceptions>false</FloatingPointExceptions>
- <CreateHotpatchableImage>false</CreateHotpatchableImage>
- <CompileAsManaged>false</CompileAsManaged>
-@@ -1715,4 +1715,4 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project> -\ No newline at end of file -+</Project>
|