diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-09-14 15:54:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-10-30 01:20:23 +0200 |
| commit | 8f3f45a6b61470356b7841cacab414ae7379b6e2 (patch) | |
| tree | fd823737d86347cc88cbfaefbf67b88959bdff30 /sdext | |
| parent | upgrade poppler to 22.01.0 (diff) | |
| download | core-8f3f45a6b61470356b7841cacab414ae7379b6e2.tar.gz core-8f3f45a6b61470356b7841cacab414ae7379b6e2.zip | |
poppler: upgrade to release 22.09.0
Fixes CVE-2022-38784
Add external/poppler/disable-freetype.patch.1 to get rid of some new
code that unconditionally requires freetype, to avoid building that on
WNT/MACOSX.
Change-Id: I854d1865286b6fb4112cdf37898cda0203c52f2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139941
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 8fce9a0a41b1bbebd325fc9d98a79d8decd3950c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139967
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit bdbb450ed0ded86fb50d6b19a2cce0f11ca74b07)
Conflicts:
sdext/Executable_xpdfimport.mk
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/Executable_xpdfimport.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index dde84963a1fb..fd07f7b43956 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -22,4 +22,8 @@ $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl \ )) +$(eval $(call gb_Executable_use_system_win32_libs,xpdfimport,\ + shell32 \ +)) + # vim:set noet sw=4 ts=4: |