upgrade to poppler-0.26.4

Change-Id: Ia5c85b8e697491aafc9de4838504226f11480b44
Reviewed-on: https://gerrit.libreoffice.org/11081
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

5 files changed, 20 insertions, 11 deletions

diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index b69a817358e2..3f9c9f857357 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/poppler-nochecknew.patch.1 \
 	external/poppler/poppler-vs2013.patch.1 \
+	external/poppler/poppler-0.26.4-std-max.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/poppler/poppler-0.26.4-std-max.patch.1 b/external/poppler/poppler-0.26.4-std-max.patch.1
new file mode 100644
index 000000000000..0c5a2c8f1c2b
--- /dev/null
+++ b/external/poppler/poppler-0.26.4-std-max.patch.1
@@ -0,0 +1,10 @@
+--- a/poppler/Annot.cc
++++ b/poppler/Annot.cc
+@@ -71,6 +71,7 @@
+ #include "DateInfo.h"
+ #include "Link.h"
+ #include <string.h>
++#include <algorithm>
+ 
+ #if MULTITHREADED
+ #  define annotLocker()   MutexLocker locker(&mutex)
diff --git a/external/poppler/poppler-notests.patch.1 b/external/poppler/poppler-notests.patch.1
index 7fcfee95ab2b..a92ce57b052e 100644
--- a/external/poppler/poppler-notests.patch.1
+++ b/external/poppler/poppler-notests.patch.1
@@ -1,11 +1,11 @@
---- poppler-0.22.5/Makefile.in	2013-06-16 18:24:09.000000000 +0200
-+++ poppler-0.22.5/Makefile.in	2013-07-08 17:10:53.382213184 +0200
-@@ -456,7 +456,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -470,7 +470,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-testdatadir=$(TESTDATADIR)
  @BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
  @BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
  @BUILD_UTILS_TRUE@utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt4_subdir) $(cpp_subdir)
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
  
  # Add CMake buildsystem files here so they get added on make dist
  EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1
index 389a5b0fc97e..aaced8e099c2 100644
--- a/external/poppler/poppler-snprintf.patch.1
+++ b/external/poppler/poppler-snprintf.patch.1
@@ -46,5 +46,4 @@
 +#endif
  
  #include "PageLabelInfo.h"
- 
-Only in poppler-0.22.5: poppler-snprintf.patch.1
+ #include "PageLabelInfo_p.h"
diff --git a/external/poppler/poppler-vs2013.patch.1 b/external/poppler/poppler-vs2013.patch.1
index 4b201f9fc3e7..ca892dfc2500 100644
--- a/external/poppler/poppler-vs2013.patch.1
+++ b/external/poppler/poppler-vs2013.patch.1
@@ -1,12 +1,11 @@
--*- Mode:Diff -*-
 --- poppler/poppler/poppler-config.h.in
 +++ poppler/poppler/poppler-config.h.in
-@@ -164,7 +164,7 @@
+@@ -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) max(a, b)
- #define fmin(a, b) min(a, b)
+ #define fmax(a, b) std::max(a, b)
+ #define fmin(a, b) std::min(a, b)
  #endif