diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-09-14 15:54:49 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-10-16 12:25:51 +0200 |
| commit | f193bef592f17f37c0356133af149271841d4e2f (patch) | |
| tree | c5db95aaa76c0c9059669fd3142be6246f56a38a /sdext | |
| parent | d2ce20f172ebbbcb32631bb9a1d37861a0791f7e (diff) | |
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>
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 bbdc76217c59..8c2543cf0cd7 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -24,6 +24,10 @@ $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl \ )) +$(eval $(call gb_Executable_use_system_win32_libs,xpdfimport,\ + shell32 \ +)) + $(eval $(call gb_Executable_add_default_nativeres,xpdfimport)) ifneq ($(SYSTEM_POPPLER),) |