download.lst | 4 +-
external/freetype/UnpackedTarball_freetype.mk | 1
external/freetype/freetype-msvc-disable-sse2.patch.1 | 37 -------------------
3 files changed, 2 insertions(+), 40 deletions(-)
New commits:
commit aae1c366ad6ff8bbf60a84cafecfce7172db077c
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Feb 20 13:06:13 2019 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Aug 26 12:39:54 2020 +0200
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.st...@cib.de>
Tested-by: Michael Stahl <michael.st...@cib.de>
diff --git a/download.lst b/download.lst
index 283c3d43bed2..a265d508d677 100644
--- a/download.lst
+++ b/download.lst
@@ -110,8 +110,8 @@ export FONT_OPENDYSLEXIC_SHA256SUM :=
ff19e6ba9b4ed56bca374bdbd2ad7ed11267addd18
export FONT_OPENDYSLEXIC_TARBALL := opendyslexic-0.9.10-beta-2019.09.16.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
-export FREETYPE_TARBALL := freetype-2.8.1.tar.bz2
+export FREETYPE_SHA256SUM :=
db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
+export FREETYPE_TARBALL := freetype-2.9.1.tar.bz2
export GLM_SHA256SUM :=
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
export GLM_TARBALL :=
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
export GPGME_SHA256SUM :=
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
