[Libreoffice-commits] core.git: download.lst external/poppler

[David Tardon]

 download.lst                                                 |    4 ++--
 external/poppler/UnpackedTarball_poppler.mk                  |    1 -
 external/poppler/poppler-0.46.0-unused-private-field.patch.1 |   11 -----------
 external/poppler/ubsan.patch.0                               |   11 -----------
 4 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit dc522a114d24ad7c550c072d4f29f50a62260b77
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 22 10:16:56 2016 +0200

    upload poppler 0.48.0
    
    Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825

diff --git a/download.lst b/download.lst
index 222f7e7..4571338 100644
--- a/download.lst
+++ b/download.lst
@@ -132,8 +132,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9
 export PNG_TARBALL := libpng-1.6.24.tar.gz
-export POPPLER_MD5SUM := 38c758d84437378ec4f5aae9f875301d
-export POPPLER_TARBALL := poppler-0.46.0.tar.bz2
+export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174
+export POPPLER_TARBALL := poppler-0.48.0.tar.xz
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 
 ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index 4de2242..a0b6595 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	external/poppler/poppler-mac-fake.patch.1 \
 	external/poppler/poppler-vs2013.patch.1 \
 	external/poppler/poppler-0.46.0-std-max.patch.1 \
-	external/poppler/poppler-0.46.0-unused-private-field.patch.1 \
 	external/poppler/ubsan.patch.0 \
 ))
 
diff --git a/external/poppler/poppler-0.46.0-unused-private-field.patch.1 b/external/poppler/poppler-0.46.0-unused-private-field.patch.1
deleted file mode 100644
index e0765fc..0000000
--- a/external/poppler/poppler-0.46.0-unused-private-field.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/goo/GooString.h
-+++ b/goo/GooString.h
-@@ -175,7 +175,7 @@
-   // You can tweak the final object size for different time/space tradeoffs.
-   // In libc malloc(), rounding is 16 so it's best to choose a value that
-   // is a multiple of 16.
--  class MemoryLayout {
-+  struct MemoryLayout {
-       char c[sizeof(char*)];
-       int i;
-       char* s;
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index a27f00f..575cb47 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -1,14 +1,3 @@
---- goo/GooString.cc
-+++ goo/GooString.cc
-@@ -161,7 +161,7 @@
-       // assert(s != s1) the roundedSize condition ensures this
-       if (newLength < length) {
- 	memcpy(s1, s, newLength);
--      } else {
-+      } else if (length != 0) {
- 	memcpy(s1, s, length);
-       }
-       if (s != sStatic)
 --- poppler/Form.cc
 +++ poppler/Form.cc
 @@ -463,12 +463,11 @@