[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
download.lst |4 +-
external/poppler/0001-Fix-building-with-old-clang.patch.1 | 25
external/poppler/ExternalProject_poppler.mk |2 -
external/poppler/UnpackedTarball_poppler.mk |1
external/poppler/ubsan.patch.0| 28 +++---
5 files changed, 44 insertions(+), 16 deletions(-)
New commits:
commit 4490513018868f1752c693c9480d28277920a3e0
Author: David Tardon
Date: Thu Sep 7 15:50:09 2017 +0200
upload poppler 0.59.0
Change-Id: I21dfa3aa04bd960cb2fb87a53213ae4bbd510a24
Reviewed-on: https://gerrit.libreoffice.org/42061
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 1c983335116a6f09cabf0b3eae7f5195341e)
Reviewed-on: https://gerrit.libreoffice.org/56256
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index ccd5e8b3b1bd..5677ab58e433 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_MD5SUM := f7a8230626b6d2061acfdc852930b7dd
-export POPPLER_TARBALL := poppler-0.55.0.tar.xz
+export POPPLER_MD5SUM := 6e44408a3b4f4a738f8a6770d0aea8a5
+export POPPLER_TARBALL := poppler-0.59.0.tar.xz
export POSTGRESQL_TARBALL :=
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/0001-Fix-building-with-old-clang.patch.1
b/external/poppler/0001-Fix-building-with-old-clang.patch.1
new file mode 100644
index ..dcddd11d2967
--- /dev/null
+++ b/external/poppler/0001-Fix-building-with-old-clang.patch.1
@@ -0,0 +1,25 @@
+From dd80c182cbcb188af0dd590f222ba9bbb31e3fb7 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid
+Date: Mon, 4 Sep 2017 19:36:06 +0200
+Subject: [PATCH] Fix building with old clang
+
+---
+ poppler/StructElement.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
+index 0fbd336a..451213f8 100644
+--- a/poppler/StructElement.cc
b/poppler/StructElement.cc
+@@ -248,6 +248,8 @@ struct AttributeMapEntry {
+ };
+
+ struct AttributeDefaults {
++ AttributeDefaults() {}; // needed to support old clang
++
+ Object Inline = Object(objName, "Inline");
+ Object LrTb = Object(objName, "LrTb");
+ Object Normal = Object(objName, "Normal");
+--
+2.13.5
+
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index f72c040c513b..94c8eb650dbc 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
+ external/poppler/0001-Fix-building-with-old-clang.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index e0bf164ce7fc..f6e4667dc133 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -9,7 +9,7 @@
{
doc = docA;
xref = doc->getXRef();
- aobj->copy();
+ obj = aobj->copy();
- Dict* dict = obj.getDict();
ref.num = ref.gen = 0;
type = ty;
@@ -23,9 +23,9 @@
+void FormField::init(std::set *usedParents)
+{
+ Dict* dict = obj.getDict();
- Object obj1;
//childs
- if (dict->lookup("Kids", )->isArray()) {
+ Object obj1 = dict->lookup("Kids");
+ if (obj1.isArray()) {
@@ -803,9 +806,15 @@
//
// FormFieldButton
@@ -80,14 +80,16 @@
numChoices = 0;
choices = NULL;
editedChoice = NULL;
-@@ -1379,9 +1400,15 @@
+@@ -1379,11 +1400,17 @@
//
// FormFieldSignature
//
-FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref&
ref, FormField *parent, std::set *usedParents)
-- : FormField(docA, dict, ref, parent, usedParents, formSignature)
+- : FormField(docA, dict, ref, parent, usedParents, formSignature),
+FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref&
ref, FormField *parent)
-+ : FormField(docA, dict, ref, parent, formSignature)
++ : FormField(docA, dict, ref, parent, formSignature),
+ signature_type(adbe_pkcs7_detached),
+ signature(nullptr), signature_info(nullptr)
{
+}
+
@@ -99,9 +101,9 @@
signature_info = new SignatureInfo();
@@ -1691,15 +1718,15 @@
- FormField *field;
- if
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
download.lst|4 +-
external/poppler/UnpackedTarball_poppler.mk |2 -
external/poppler/poppler-0.46.0-std-max.patch.1 | 10 --
external/poppler/poppler-vs2013.patch.1 | 11 ---
external/poppler/ubsan.patch.0 | 37
5 files changed, 2 insertions(+), 62 deletions(-)
New commits:
commit b5411a225f25f7157649fcd42b710396b609d62c
Author: David Tardon
Date: Wed Nov 23 13:47:52 2016 +0100
upload poppler 0.49.0
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427
Reviewed-on: https://gerrit.libreoffice.org/3
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4)
Signed-off-by: David Tardon
(cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510)
Reviewed-on: https://gerrit.libreoffice.org/56254
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 958ed3048252..18681926e860 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.tar.gz
-export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174
-export POPPLER_TARBALL := poppler-0.48.0.tar.xz
+export POPPLER_MD5SUM := 9e057ed8eee1f9979fa75d8f044783b8
+export POPPLER_TARBALL := poppler-0.49.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 afad5fba13b6..f72c040c513b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-notests.patch.1 \
$(if $(filter
MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
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/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
))
diff --git a/external/poppler/poppler-0.46.0-std-max.patch.1
b/external/poppler/poppler-0.46.0-std-max.patch.1
deleted file mode 100644
index 96a9abe88695..
--- a/external/poppler/poppler-0.46.0-std-max.patch.1
+++ /dev/null
@@ -1,10 +0,0 @@
a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -48,6 +48,7 @@
- #include
- #include
- #include
-+#include
- #include "goo/GooString.h"
- #include "goo/GooList.h"
- #include "goo/GooHash.h"
diff --git a/external/poppler/poppler-vs2013.patch.1
b/external/poppler/poppler-vs2013.patch.1
deleted file mode 100644
index ca892dfc2500..
--- a/external/poppler/poppler-vs2013.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
poppler/poppler/poppler-config.h.in
-+++ poppler/poppler/poppler-config.h.in
-@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char
**save_ptr);
- #define GCC_PRINTF_FORMAT(fmt_index, va_index)
- #endif
-
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1800
- #define fmax(a, b) std::max(a, b)
- #define fmin(a, b) std::min(a, b)
- #endif
commit 8096faecce90b327c4ff0e0951460411471e52c8
Author: Michael Stahl
Date: Thu Nov 3 11:13:29 2016 +0100
poppler: remove obsolete ubsan patch hunk
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
Tested-by: Thorsten Behrens
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 575cb47dc682..67675253b5ad 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -216,43 +216,6 @@
SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
poppler/Stream.cc
-+++ poppler/Stream.cc
-@@ -2966,12 +2966,12 @@
- } else {
- amp = 0;
- }
-- data[0] += (*prevDC += amp) << scanInfo.al;
-+ data[0] += (int) ((unsigned) (*prevDC += amp) << scanInfo.al);
- } else {
- if ((bit = readBit()) == ) {
- return gFalse;
- }
-- data[0] += bit << scanInfo.al;
-+ data[0] += (unsigned) bit << scanInfo.al;
- }
- ++i;
- }
-@@ -3064,7 +3064,7 @@
- j = dctZigZag[i++];
- }
- }
-- data[j] = amp << scanInfo.al;
-+ data[j] = (unsigned) amp << scanInfo.al;
- }
- }
-
-@@ -3251,8 +3251,8 @@
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - download.lst external/poppler
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 | 229 ++-
4 files changed, 220 insertions(+), 25 deletions(-)
New commits:
commit 7f51b445b4dd3950527d826c01091be4e9a77be0
Author: David Tardon
Date: Sat Oct 22 10:16:56 2016 +0200
upload poppler 0.48.0
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825
(cherry picked from commit dc522a114d24ad7c550c072d4f29f50a62260b77)
Reviewed-on: https://gerrit.libreoffice.org/56252
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 42ed25265e27..958ed3048252 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_MD5SUM := 897ccec1ebfb0922e83c2bfaa1be8748
export PNG_TARBALL := libpng-1.6.28.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 efcbee7c7e0f..afad5fba13b6 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 \
external/poppler/poppler-libjpeg.patch.1 \
))
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 e0765fc92251..
--- 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 a27f00f790d2..575cb47dc682 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 @@
commit 3c181843cb878f4ac5a563e0ceff582d46763a45
Author: Stephan Bergmann
Date: Fri Oct 14 15:34:53 2016 +0200
external/poppler: Avoid UBSan warning about undefined downcast
...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 0x60f00040 which
does not point to an object of type 'FormFieldSignature'
> 0x60f00040: 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, std::allocator >*,
FormFieldType) workdir/UnpackedTarball/poppler/poppler/Form.cc:547:7
> #3 0x74ec2b in FormFieldSignature::FormFieldSignature(PDFDoc*,
Object*, Ref const&, FormField*, std::set,
std::allocator >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1383:5
> #4 0x740d7f in Form::createFieldFromDict(Object*, PDFDoc*, Ref
const&, FormField*, std::set, std::allocator >*)
workdir/UnpackedTarball/poppler/poppler/Form.cc:1700:19
> #5 0x750727 in
