[Libreoffice-commits] core.git: download.lst external/pdfium solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 download.lst                      |    4 ++--
 external/pdfium/Library_pdfium.mk |    2 --
 external/pdfium/build.patch.1     |   13 -------------
 solenv/flatpak-manifest.in        |    4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 2044475c8cb33b76591aa6de77dd43a0bf9f5145
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Jan 15 21:18:44 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jan 16 09:02:48 2019 +0100

    external: update pdfium to 3667
    
    Change-Id: Ie4f0cc8f06432e182ce7ffcae5269075d12658ef
    Reviewed-on: https://gerrit.libreoffice.org/66408
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/download.lst b/download.lst
index e93847c57e59..0c44293e384c 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b633
 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
 export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
-export PDFIUM_SHA256SUM := c42cdff8e18b9369bc9383e0e8c2531b5631a2712852a26d8e7593021561de89
-export PDFIUM_TARBALL := pdfium-3613.tar.bz2
+export PDFIUM_SHA256SUM := 012ef554e7a6ec6d794f9ff7e66ff71011cab1b67317b427d9c820c48c141e5e
+export PDFIUM_TARBALL := pdfium-3667.tar.bz2
 export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index 9fb124f4d4a4..ccf41b3f5b7c 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -372,7 +372,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/core/fxcrt/fx_memory \
     UnpackedTarball/pdfium/core/fxcrt/fx_stream \
     UnpackedTarball/pdfium/core/fxcrt/fx_system \
-    UnpackedTarball/pdfium/core/fxcrt/fx_ucddata \
     UnpackedTarball/pdfium/core/fxcrt/fx_unicode \
     UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmldocument \
     UnpackedTarball/pdfium/core/fxcrt/xml/cfx_xmlelement \
@@ -488,7 +487,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_ctrl \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_edit_impl \
-    UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_font_map \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_icon \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_box \
     UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_list_impl \
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1
index 1a223352ddf8..721c1784719d 100644
--- a/external/pdfium/build.patch.1
+++ b/external/pdfium/build.patch.1
@@ -147,16 +147,3 @@ index 7050f695b..916afed8b 100644
  };
  
  #endif  // CORE_FPDFDOC_CPDF_FILESPEC_H_
-diff --git a/core/fxcrt/fx_coordinates.cpp b/core/fxcrt/fx_coordinates.cpp
-index fabde1e80..92a423cc6 100644
---- a/core/fxcrt/fx_coordinates.cpp
-+++ b/core/fxcrt/fx_coordinates.cpp
-@@ -302,7 +302,7 @@ std::ostream& operator<<(std::ostream& os, const CFX_RectF& rect) {
- 
- std::tuple<float, float, float, float, float, float> CFX_Matrix::AsTuple()
-     const {
--  return {a, b, c, d, e, f};
-+  return std::tuple<float, float, float, float, float, float>(a, b, c, d, e, f);
- }
- 
- CFX_Matrix CFX_Matrix::GetInverse() const {
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 8106f7d30048..56c21134f975 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -61,8 +61,8 @@
                     "type": "shell"
                 },
                 {
-                    "url": "https://dev-www.libreoffice.org/src/pdfium-3613.tar.bz2",
-                    "sha256": "c42cdff8e18b9369bc9383e0e8c2531b5631a2712852a26d8e7593021561de89",
+                    "url": "https://dev-www.libreoffice.org/src/pdfium-3667.tar.bz2",
+                    "sha256": "012ef554e7a6ec6d794f9ff7e66ff71011cab1b67317b427d9c820c48c141e5e",
                     "type": "file",
                     "dest-filename": "external/tarballs/pdfium-3613.tar.bz2"
                 },