summaryrefslogtreecommitdiff
path: root/external/poppler/UnpackedTarball_poppler.mk
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2022-09-14 15:54:49 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2022-09-15 08:32:41 +0200
commit8fce9a0a41b1bbebd325fc9d98a79d8decd3950c (patch)
treed420e24b5a0304e2919e8fde4a09b17ff45fee39 /external/poppler/UnpackedTarball_poppler.mk
parent1b705ea0e912604a5a7e35c9dd3c861da1c362c4 (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>
Diffstat (limited to 'external/poppler/UnpackedTarball_poppler.mk')
-rw-r--r--external/poppler/UnpackedTarball_poppler.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index b790693889d3..5726814fee82 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-config.patch.1 \
external/poppler/pch.patch.0 \
+ external/poppler/disable-freetype.patch.1 \
+ external/poppler/gcc7-EntityInfo.patch.1 \
))
ifneq ($(filter -fsanitize=%,$(CC)),)