[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/poppler

[Michael Stahl]

 external/poppler/UnpackedTarball_poppler.mk |    1 +
 external/poppler/msvc2013.patch.1           |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit cc16da8eb5f2929aa78e7ccaee158d81383bf817
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Mon Jun 25 14:07:31 2018 +0200

    poppler: try to appease MSVC 2013
    
    C:/PROGRA~2/MICROS~1.0/VC/include\xlocnum(155) : error C2280: 'Object::Object(const Object &)' : attempting to reference a deleted function
    c:\lo\lode\dev\core\workdir\unpackedtarball\poppler\poppler\Object.h(184) : see declaration of 'Object::Object'
    This diagnostic occurred in the compiler generated function 'DictEntry::DictEntry(const DictEntry &)
    
    Change-Id: I731eea024b9498f519f096d237b04e29d8a90892
    Reviewed-on: https://gerrit.libreoffice.org/56396
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index f29933618b18..30de3a48190f 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
 	$(if $(filter MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
+	external/poppler/msvc2013.patch.1 \
 	external/poppler/poppler-config.patch.1 \
 ))
 
diff --git a/external/poppler/msvc2013.patch.1 b/external/poppler/msvc2013.patch.1
new file mode 100644
index 000000000000..8c31baf873fc
--- /dev/null
+++ b/external/poppler/msvc2013.patch.1
@@ -0,0 +1,14 @@
+--- poppler/poppler/Dict.h.orig	2018-06-25 13:58:43.086965564 +0200
++++ poppler/poppler/Dict.h	2018-06-25 13:55:44.353387730 +0200
+@@ -44,6 +44,11 @@
+ struct DictEntry {
+   char *key;
+   Object val;
++  // appease MSVC2013
++  DictEntry(DictEntry const&) = delete;
++  DictEntry& operator=(DictEntry const&) = delete;
++  DictEntry(DictEntry &&) = default;
++  DictEntry& operator=(DictEntry &&) = default;
+ };
+ 
+ class Dict {