[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - download.lst external/poppler
download.lst |4 - external/poppler/README |2 external/poppler/StaticLibrary_poppler.mk|6 + external/poppler/UnpackedTarball_poppler.mk |1 external/poppler/disable-freetype.patch.1| 18 ++--- external/poppler/disable-nss-and-gpgmepp.patch.1 | 76 +++ external/poppler/gcc7-EntityInfo.patch.1 | 43 +++-- external/poppler/poppler-config.patch.1 | 40 ++-- 8 files changed, 141 insertions(+), 49 deletions(-) New commits: commit f543a8a849e6287b88b2d28ff49a01b2b09c3e94 Author: Michael Stahl AuthorDate: Mon Sep 25 15:50:43 2023 +0200 Commit: Michael Stahl CommitDate: Wed Sep 27 12:16:23 2023 +0200 poppler: upgrade to release 23.09.0 Fixes CVE-2023-34872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253 Reviewed-by: Xisco Fauli (cherry picked from commit 6d1c0e802eaefa1c42051c1456be61cef2dc2e86) Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157293 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index 89ebf334a889..1874fbbf3846 100644 --- a/download.lst +++ b/download.lst @@ -475,8 +475,8 @@ LIBPNG_TARBALL := libpng-1.6.37.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65 -POPPLER_TARBALL := poppler-23.06.0.tar.xz +POPPLER_SHA256SUM := 80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55 +POPPLER_TARBALL := poppler-23.09.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 4915c5e81fff..62877a0f0059 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -11,7 +11,10 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,poppler)) $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler)) -$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg)) +$(eval $(call gb_StaticLibrary_use_externals,poppler,\ + libjpeg \ + zlib \ +)) $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler)) @@ -90,6 +93,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/FDPDFDocBuilder \ UnpackedTarball/poppler/poppler/FILECacheLoader \ UnpackedTarball/poppler/poppler/FileSpec \ + UnpackedTarball/poppler/poppler/FlateEncoder \ UnpackedTarball/poppler/poppler/FontEncodingTables \ UnpackedTarball/poppler/poppler/FontInfo \ UnpackedTarball/poppler/poppler/Form \ diff --git a/external/poppler/disable-freetype.patch.1 b/external/poppler/disable-freetype.patch.1 index 77c643de40f5..3c4d1d0f7a8a 100644 --- a/external/poppler/disable-freetype.patch.1 +++ b/external/poppler/disable-freetype.patch.1 @@ -19,9 +19,9 @@ disable freetype dependent code -#include FT_FREETYPE_H +//#include +//#include FT_FREETYPE_H + #include // helper for using std::visit to get a dependent false for static_asserts - // to help get compile errors if one ever extends variants @@ -2760,6 +2760,8 @@ Form::AddFontResult Form::addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle, bool forceName) diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index be8fc98556a7..8f71e987b2b9 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -2,7 +2,7 @@ note: to get the 3rd one, use -DENABLE_CPP=on -mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6 +mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off manually disabled these because cmake failed to do it: HAV
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - download.lst external/poppler
download.lst|4 - external/poppler/StaticLibrary_poppler.mk | 46 +++-- external/poppler/UnpackedTarball_poppler.mk |3 external/poppler/disable-freetype.patch.1 |4 - external/poppler/gcc7-GfxFont.patch.1 | 94 external/poppler/poppler-config.patch.1 | 14 ++-- 6 files changed, 131 insertions(+), 34 deletions(-) New commits: commit 3c627c338fcfc5039d110c15e2e9089eb687c3f8 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Tue Mar 14 19:01:26 2023 +0900 Commit: Michael Stahl CommitDate: Wed Sep 27 12:15:53 2023 +0200 poppler: upgrade to release 23.03.0 * Upgrade poppler-data to 0.4.12 * Update poppler-config.patch.1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251 (cherry picked from commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08) Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157291 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index d490f3cd6bf3..00523c9e32d6 100644 --- a/download.lst +++ b/download.lst @@ -475,8 +475,8 @@ LIBPNG_TARBALL := libpng-1.6.37.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -POPPLER_SHA256SUM := d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 -POPPLER_TARBALL := poppler-22.12.0.tar.xz +POPPLER_SHA256SUM := b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4 +POPPLER_TARBALL := poppler-23.03.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 1f1adba6ee34..4915c5e81fff 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -53,24 +53,26 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,poppler,\ )) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ + UnpackedTarball/poppler/goo/gbase64 \ + UnpackedTarball/poppler/goo/gbasename \ UnpackedTarball/poppler/goo/gfile \ - UnpackedTarball/poppler/goo/GooTimer \ + UnpackedTarball/poppler/goo/glibc \ + UnpackedTarball/poppler/goo/glibc_strtok_r \ + UnpackedTarball/poppler/goo/grandom \ + UnpackedTarball/poppler/goo/gstrtod \ UnpackedTarball/poppler/goo/GooString \ + UnpackedTarball/poppler/goo/GooTimer \ + UnpackedTarball/poppler/goo/ImgWriter \ + UnpackedTarball/poppler/goo/JpegWriter \ UnpackedTarball/poppler/goo/NetPBMWriter \ UnpackedTarball/poppler/goo/PNGWriter \ UnpackedTarball/poppler/goo/TiffWriter \ - UnpackedTarball/poppler/goo/JpegWriter \ - UnpackedTarball/poppler/goo/ImgWriter \ - UnpackedTarball/poppler/goo/gstrtod \ - UnpackedTarball/poppler/goo/grandom \ - UnpackedTarball/poppler/goo/glibc \ - UnpackedTarball/poppler/goo/glibc_strtok_r \ UnpackedTarball/poppler/fofi/FoFiBase \ UnpackedTarball/poppler/fofi/FoFiEncodings \ + UnpackedTarball/poppler/fofi/FoFiIdentifier \ UnpackedTarball/poppler/fofi/FoFiTrueType \ UnpackedTarball/poppler/fofi/FoFiType1 \ UnpackedTarball/poppler/fofi/FoFiType1C \ - UnpackedTarball/poppler/fofi/FoFiIdentifier \ UnpackedTarball/poppler/poppler/Annot \ UnpackedTarball/poppler/poppler/AnnotStampImageHelper \ UnpackedTarball/poppler/poppler/Array \ @@ -80,6 +82,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/CertificateInfo \ UnpackedTarball/poppler/poppler/CharCodeToUnicode \ UnpackedTarball/poppler/poppler/CMap \ + UnpackedTarball/poppler/poppler/DCTStream \ UnpackedTarball/poppler/poppler/DateInfo \ UnpackedTarball/poppler/poppler/Decrypt \ UnpackedTarball/poppler/poppler/Dict \ @@ -88,8 +91,8 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/FILECacheLoader \ UnpackedTarball/poppler/poppler/FileSpec \ UnpackedTarball/poppler/poppler/FontEncodingTables \ - UnpackedTarball/poppler/poppler/Form \ UnpackedTarball/poppler/poppler/FontInfo \ + UnpackedTarball/poppler/poppler/Form \ UnpackedTarball/poppler/poppler/Function \ UnpackedTarball/poppler/poppler/Gfx \ UnpackedTarball/poppler/poppler/GfxFont \ @@ -101,43 +104,42 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/JBIG2Stream \ UnpackedTarball/popp
