summaryrefslogtreecommitdiff
path: root/external/poppler
AgeCommit message (Collapse)AuthorFilesLines
2019-08-30poppler: upgrade to release 0.74.0Michael Stahl3-6/+34
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f) Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906
2019-08-30poppler: upgrade to release 0.73.0Michael Stahl4-11/+49
Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d Reviewed-on: https://gerrit.libreoffice.org/66306 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da) Reviewed-on: https://gerrit.libreoffice.org/66369 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772)
2019-08-30poppler: fix incorrect GCC_VERSION checkMichael Stahl1-2/+3
The minor version is encoded into the last 2 digits, the micro version is not avialable. Change-Id: I4eee40511d732ec8cfc8d85943b965bb6e06d66e Reviewed-on: https://gerrit.libreoffice.org/56380 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins (cherry picked from commit 16b10d9ac976d40daffee1d15456016f4a89cd2e) Reviewed-on: https://gerrit.libreoffice.org/56388 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9c3a0c9e5f33d1a53afe76135739896dfa63fc2a)
2019-08-30poppler: try to work around GCC 4.8.2 bugMichael Stahl1-0/+15
As seen on Linux-rpm_deb-x86@71-TDF: poppler/Annot.cc:2491:1: internal compiler error: in connect_traces, at dwarf2cfi.c:2676 The bug report claims that -march=i586 works around the bug. Change-Id: I1d97d2df9049e058d49987424cc8e4818a9fa9c6 (cherry picked from commit 1c7921c43960a4a6717c816d646cf0f65fbaec12) Reviewed-on: https://gerrit.libreoffice.org/56292 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dce6401f7e1f466c30996ad606699479713209e5) Reviewed-on: https://gerrit.libreoffice.org/56299 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b3450c197e8c5349cbe452ebb9f79f291e8b8383)
2019-08-30poppler: poppler-snprintf.patch.1 needs rebaseMichael Stahl1-1/+1
Presumably it's needed for MSVC 2013. Change-Id: Ibcd3bab373616faa58db4dab0f92f058d1dfafac Reviewed-on: https://gerrit.libreoffice.org/56274 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 15cbef65b217e3ca09a5624ecd82624e4ed93785)
2019-08-30poppler: upgrade to release 0.66.0Michael Stahl10-359/+614
Unfortunately the autotools build system was removed in 0.60.0, and the CMake one is a bit overeager in linking against system libraries that happen to be installed on the build machine, and we currently don't require CMake anyway, so avoid the problems by using a gbuild makefile and a patch to add the generated header files. Remove all current patches: poppler-notests.patch.1: obsolete (autotools build system) poppler-mac-fake.patch.1: presumed obsolete ubsan.patch.0: presumably fixed differently upstream in https://cgit.freedesktop.org/poppler/poppler/commit/?id=f43cb73939f85952d83afc87a6dc638dc1ae311b poppler-libjpeg.patch.1: obsolete (autotools build system; there appears to be no way to do this with CMake?) 0001-Fix-building-with-old-clang.patch.1: merged upstream Change-Id: I271c87ab3ec25cc9d1e8fafb04dae7c004acc350 (cherry picked from commit 5f8426a077ec0986a4b6cf8a58515ad5496f78e0) Reviewed-on: https://gerrit.libreoffice.org/56259 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit df46a8beb12639b0cdf6a23d2c1107ffd7f7c86c)
2019-08-30upload poppler 0.59.0David Tardon3-12/+40
Change-Id: I21dfa3aa04bd960cb2fb87a53213ae4bbd510a24 Reviewed-on: https://gerrit.libreoffice.org/42061 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1c983335116a6f09cabf0b3eae7f51951111341e) Reviewed-on: https://gerrit.libreoffice.org/56256 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b21a87eebf8b72a70ec7788d883cd75e485a2eca)
2019-08-30upload poppler 0.55.0David Tardon2-2/+2
Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616 Reviewed-on: https://gerrit.libreoffice.org/37998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b12e16f8fc186117cbb20cc3866bf052a3d75515) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 51775f495f0399177edbcabb2ad881cdd9f57e0f) Reviewed-on: https://gerrit.libreoffice.org/56255 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 135a80337da4549df6b0a5c14ad38e9edc0680f3)
2019-08-30upload poppler 0.49.0David Tardon3-23/+0
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427 Reviewed-on: https://gerrit.libreoffice.org/31111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510) Reviewed-on: https://gerrit.libreoffice.org/56254 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9c458cb6de652edd48b84b25ccb22dab1b0b4f22)
2019-08-30poppler: remove obsolete ubsan patch hunkMichael Stahl1-37/+0
With eea709f67d91e271e3df37e6c6724b7b5870b1ee "poppler: build against libjpeg" the poppler internal JPEG code is no longer used. Change-Id: I018a53a495ec505af92bb9b1c1a0c42e0a4f35b8 (cherry picked from commit 21ca0db5ec27662a3e047d7547eae9beb87b0b01) Reviewed-on: https://gerrit.libreoffice.org/56253 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit ae00e06b99d66fdf5306e73df8f85397fa0ab7c3)
2019-08-30upload poppler 0.48.0David Tardon3-23/+0
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825 (cherry picked from commit dc522a114d24ad7c550c072d4f29f50a62260b77) Reviewed-on: https://gerrit.libreoffice.org/56252 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2543b42096ad1be8d744eb3c9976f30add50bbb7)
2019-08-30external/poppler: Avoid UBSan warning about undefined downcastStephan Bergmann1-0/+218
...of this-ptr of in-construction FormFieldSignature while still in the base FormField ctor, as happens (in the xpdfimport process) during CppunitTest_xmlsecurity_signing: > Form.cc:448:12: runtime error: downcast of address 0x60f000000040 which does not point to an object of type 'FormFieldSignature' > 0x60f000000040: note: object is of type 'FormField' > 03 00 00 6d 50 84 f2 00 00 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00 01 be be be 07 00 00 00 > ^~~~~~~~~~~~~~~~~~~~~~~ > vptr for 'FormField' > #0 0x73d7f4 in FormWidgetSignature::FormWidgetSignature(PDFDoc*, Object*, unsigned int, Ref, FormField*) workdir/UnpackedTarball/poppler/poppler/Form.cc:448:12 > #1 0x741713 in FormField::_createWidget(Object*, Ref) workdir/UnpackedTarball/poppler/poppler/Form.cc:677:34 > #2 0x73e747 in FormField::FormField(PDFDoc*, Object*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*, FormFieldType) workdir/UnpackedTarball/poppler/poppler/Form.cc:547:7 > #3 0x74ec2b in FormFieldSignature::FormFieldSignature(PDFDoc*, Object*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1383:5 > #4 0x740d7f in Form::createFieldFromDict(Object*, PDFDoc*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1700:19 > #5 0x750727 in Form::Form(PDFDoc*, Object*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1623:33 > #6 0x71d440 in Catalog::getForm() workdir/UnpackedTarball/poppler/poppler/Catalog.cc:1042:18 > #7 0x708572 in Annots::createAnnot(Dict*, Object*) workdir/UnpackedTarball/poppler/poppler/Annot.cc:7218:41 > #8 0x70772b in Annots::Annots(PDFDoc*, int, Object*) workdir/UnpackedTarball/poppler/poppler/Annot.cc:7128:17 > #9 0x87f3e9 in Page::getAnnots(XRef*) workdir/UnpackedTarball/poppler/poppler/Page.cc:405:18 > #10 0x8814b0 in Page::displaySlice(OutputDev*, double, double, int, bool, bool, int, int, int, int, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/Page.cc:611:15 > #11 0x880ff6 in Page::display(OutputDev*, double, double, int, bool, bool, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/Page.cc:521:3 > #12 0x88d906 in PDFDoc::displayPage(OutputDev*, int, double, double, int, bool, bool, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/PDFDoc.cc:491:20 > #13 0x5d59fb in main sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx:142:14 > #14 0x7f11600ea730 in __libc_start_main (/lib64/libc.so.6+0x20730) > #15 0x459388 in _start (instdir/program/xpdfimport+0x459388) Change-Id: Ia808919c8d2363d616feb4664f314a77b40dfbb8 (cherry picked from commit 55013a7776a43bb18b7fb8faa1839369c3383cb7) Reviewed-on: https://gerrit.libreoffice.org/56251 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit cd433c539d6f3915462851f5d3f5bc8e5c600a61)
2017-04-10add missing dep on jpegDavid Tardon1-0/+4
Change-Id: I0732f23dd9daa0c3a1f138011b0db17b36b729d1 Reviewed-on: https://gerrit.libreoffice.org/32179 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5bc94f60379029f343581bef8aea3e350c7db2e4) Reviewed-on: https://gerrit.libreoffice.org/36370 Tested-by: Michael Stahl <mstahl@redhat.com>
2016-11-03poppler: build against libjpegMichael Stahl3-1/+25
Albert Astals Cid points out that --disable-libjpeg causes poppler to use internal JPEG code instead, which is not actively maintained. Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to respect LIBJPEG_LIBS. Reviewed-on: https://gerrit.libreoffice.org/30496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit eea709f67d91e271e3df37e6c6724b7b5870b1ee) jpeg-turbo: resolve some conflicts to fix poppler build poppler uses both windows.h and jpeg headers, so runs into the conflict between Win32 definitions of boolean, INT16, INT32, and jpeg's. Tweak jpeg-turbo headers so it uses the Win32 definitions. (cherry picked from commit f2761b62b3d0b45a3e57781a16c8c5c6ee94ded0) Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299 Reviewed-on: https://gerrit.libreoffice.org/30506 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-08-24Resolves: tdf#101460 use most recent poppler releaseCaolán McNamara7-28/+28
Change-Id: I660e1f13eb4b05fdb7257f422eca288c2d07cf4d Reviewed-on: https://gerrit.libreoffice.org/28087 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 10290000117b562e3f179c3d1073774dd54cdfee) Reviewed-on: https://gerrit.libreoffice.org/28366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-12-02clang-cl needs an explicit -I to find systools/win32/snprintf.hStephan Bergmann1-1/+1
...included via external/poppler/poppler-snprintf.patch.1 Change-Id: Ibe20452e7da4995ca33c97dd99dc441060e73894
2015-11-15Pass verbosity setting into ExternalProject_popplerStephan Bergmann1-0/+1
Change-Id: I9d95f6f604d7b73617bcd34f15106678b8c2ff47
2015-09-02Fix poppler on MSVC 14.0David Ostrovsky1-1/+1
Change-Id: I4791c53078f827248b6f163104727cd97dfb227f Reviewed-on: https://gerrit.libreoffice.org/17659 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-06-02external/poppler: -fsanitize=nonnull-attributeStephan Bergmann1-0/+11
Change-Id: I17c825a0e24e8993503eeaf0d1136c143d990a12
2015-03-10external/poppler: Work around -fsanitize=shiftStephan Bergmann1-0/+37
Change-Id: I5d9734f302ff58637f69c1574bc39ca85ff992e7
2015-03-02external/poppler: Work around -fsanitize=enumStephan Bergmann2-0/+11
...detecting an uninitialized encAlgorithm value is passed into parser->getObj (where it is presumably ignored for that specific set of arguments) in XRef::fetch. Change-Id: I511c8222ca8483aea1f475ba2aaefbc0cfb7dd5b
2015-02-27Pass -fvisibility-inlines-hidden into external modulesStephan Bergmann1-1/+1
Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e
2015-01-21fdo#85174 PDF Import: fix character positions without modifying popplerVort2-60/+0
Change-Id: I4ec6409e8fa13161c5cd37fcae2055b4bc5ecfd4 Reviewed-on: https://gerrit.libreoffice.org/14066 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-20fdo#85174 PDF Import: fix character positionsVort2-0/+60
Change-Id: I0aa75b6cb834341e47bbeeaa15d39387a8cb5240 Reviewed-on: https://gerrit.libreoffice.org/14029 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-12-15poppler: let's disable Qt5 tooMichael Stahl1-0/+1
Change-Id: I8571aa0ccc9f691d7fd9290a647117161755d3a7
2014-11-12Pass MAKE into external/poppler's configureStephan Bergmann1-1/+1
...which does some checks about make and could otherwise add some unhelpful MAKE=make into its Makefiles if it doesn't find a make (so that the following $(MAKE) step would needlessly fail). Change-Id: Id8d11ffbc5a09c9f7f61fb12acc2481468746404
2014-08-30upgrade to poppler-0.26.4Thomas Arnhold5-11/+20
Change-Id: Ia5c85b8e697491aafc9de4838504226f11480b44 Reviewed-on: https://gerrit.libreoffice.org/11081 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-07-07VS 2013 has fmin() and fmax()Tor Lillqvist2-0/+13
Change-Id: Iecb8e289d94c479447b80f1d5ebc21eb2210301b
2014-02-27normalize values of CROSS_COMPILINGMichael Stahl1-1/+1
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-12normalize values of SYSTEM_POPPLER, SYSTEM_JFREEREPORTMichael Stahl1-1/+1
Change-Id: I8034b6fdf85697b6b409143396983ef3170257b2
2013-11-04fdo#70393: move poppler to a subdir of externalKhaled Hosny9-0/+180
Change-Id: I399df92d2b6907c129e18f3a55afeadf02783c14 Reviewed-on: https://gerrit.libreoffice.org/6548 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>