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

[Michael Stahl]

 external/poppler/poppler-snprintf.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e70ed4b8724eab5553a16ef1562025b1574d92a
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Jun 22 10:52:37 2018 +0200

    poppler: poppler-snprintf.patch.1 needs rebase
    
    Presumably it's needed for MSVC 2013.
    
    Change-Id: Ibcd3bab373616faa58db4dab0f92f058d1dfafac
    Reviewed-on: https://gerrit.libreoffice.org/56274
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1
index aaced8e099c2..baf3e6926c36 100644
--- a/external/poppler/poppler-snprintf.patch.1
+++ b/external/poppler/poppler-snprintf.patch.1
@@ -28,8 +28,8 @@
 +#    include <systools/win32/snprintf.h>
 +#  endif
  #endif
+ #include "goo/glibc.h"
  #include "goo/gmem.h"
- #include "goo/GooString.h"
 --- poppler-0.22.5/poppler/PageLabelInfo.cc	2013-03-25 22:48:34.000000000 +0100
 +++ poppler-0.22.5/poppler/PageLabelInfo.cc	2013-07-08 16:56:47.977901129 +0200
 @@ -17,6 +17,14 @@