<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/86ddc74d15ce1344cb0c15c807fb174f8f82904c">https://github.com/macports/macports-ports/commit/86ddc74d15ce1344cb0c15c807fb174f8f82904c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 86ddc74 gdal: fix build with poppler variant
</span>86ddc74 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 86ddc74d15ce1344cb0c15c807fb174f8f82904c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Oct 21 10:12:28 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: fix build with poppler variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/OSGeo/gdal/commit/0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57183
</span>---
gis/gdal/Portfile | 3 +-
gis/gdal/files/patch-poppler.diff | 301 ++++++++++++++++++++++++++++++++++++++
2 files changed, 303 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2865a7a..fc27fac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,8 @@ patchfiles patch-gdalwarpkernel_opencl_cpp.diff \
</span> patch-apps_GNUmakefile.diff \
patch-ogr_p_h.diff \
patch-ogr_api_cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scripts-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scripts-GNUmakefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler.diff
</span>
platform darwin {
# see https://trac.macports.org/ticket/55752
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-poppler.diff b/gis/gdal/files/patch-poppler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2eb892c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,301 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 12 Oct 2018 19:02:40 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/GDALmake.opt.in | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/configure | 61 ++++++++++++++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/configure.ac | 56 +++++++++++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/GNUmakefile | 4 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/makefile.vc | 6 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/frmts/pdf/pdfdataset.cpp | 12 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdal/nmake.opt | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 111 insertions(+), 31 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 30749ae982a..f9ab41fd124 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_INC = @POPPLER_INC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/configure b/gdal/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 050bc79ac97..a8472ba8c2d 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,6 +669,7 @@ PODOFO_INC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_PODOFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_PLUGIN_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_INC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_20_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_20_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_23_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for poppler... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_OTHER_POPPLER_VERSION=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_69_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_INC=$POPPLER_INC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/configure.ac b/gdal/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4b8ab911cec..0c588e04f03 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_20_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_23_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_CHECKING([for poppler])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_OTHER_POPPLER_VERSION=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_69_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4635,6 +4660,7 @@ AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(POPPLER_INC, $POPPLER_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/GNUmakefile b/gdal/frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2c332d2798f..6a267f529b2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS += -DPOPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(POPPLER_0_69_OR_LATER),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS += -DPOPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(HAVE_PODOFO),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS += -DHAVE_PODOFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/makefile.vc b/gdal/frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b4fa14d0a18..ad76d3de70c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRAFLAGS = -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !IFDEF POPPLER_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !IFDEF POPPLER_HAS_OPTCONTENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !ENDIF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++!IFDEF POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++!ENDIF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !ENDIF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !IFDEF PODOFO_ENABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee89fd07564..1a56f57ee06 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for( const auto& refOCGPair: optContentConfig->getOCGs() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto ocg = refOCGPair.second.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GooList* ocgList = optContentConfig->getOCGs();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(int i=0;i<ocgList->getLength();i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( ocg != nullptr && ocg->getName() != nullptr )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* pszLayerName = (const char*)ocg->getName()->getCString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int bAll = EQUAL(pszLayers, "ALL");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for( const auto& refOCGPair: optContentConfig->getOCGs() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto ocg = refOCGPair.second.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GooList* ocgList = optContentConfig->getOCGs();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(i=0;i<ocgList->getLength();i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdal/nmake.opt b/gdal/nmake.opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 682d766d93e..1eb049038c8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nmake.opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nmake.opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -639,6 +639,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_ENABLED = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_HAS_OPTCONTENT = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -646,6 +647,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_0_20_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_0_23_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_0_58_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#POPPLER_0_69_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment for PDF support
</span></pre><pre style='margin:0'>
</pre>