<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/6764f85b8bee5446489b6ce4270ad010641fe094">https://github.com/macports/macports-ports/commit/6764f85b8bee5446489b6ce4270ad010641fe094</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 6764f85 gdal: bump to 3.0.1
</span>6764f85 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6764f85b8bee5446489b6ce4270ad010641fe094
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Sep 3 14:23:38 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: bump to 3.0.1
</span>---
gis/gdal/Portfile | 31 +--
gis/gdal/files/MacTypes.diff | 13 -
gis/gdal/files/patch-alg_GNUmakefile.diff | 13 -
gis/gdal/files/patch-apps_GNUmakefile.diff | 11 -
.../files/patch-gdalwarpkernel_opencl_cpp.diff | 14 -
gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff | 11 -
gis/gdal/files/patch-ogr_api_cpp.diff | 11 -
gis/gdal/files/patch-ogr_p_h.diff | 11 -
gis/gdal/files/patch-poppler.diff | 301 ---------------------
gis/gdal/files/patch-port-cpl_spawn.cpp.diff | 10 -
gis/gdal/files/patch-scripts-GNUmakefile.diff | 13 -
11 files changed, 8 insertions(+), 431 deletions(-)
<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 31f7b4e..8562d2d 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;'>@@ -9,8 +9,8 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
mpi.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo gdal 2.3.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal 3.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,18 +29,11 @@ long_description GDAL is a translator library for raster geospatial \
</span>
homepage http://www.gdal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 50fe790adb52523a525cbae99d5b1790bcb5cdc8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f0f61fedb7880d26947e2bb3c54885639c603edd53421aed0a7eeb150c6728f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21577147
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0b7be0a5e21d3eef8884783c94963c2f91e6f3d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f6b8147f031cb93291535c3d632e8cacdb8f445b9f9b0e3eb8cff7a8d3f76359 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22392099
</span>
worksrcdir ${worksrcpath}/gdal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gdalwarpkernel_opencl_cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gdalwarpkernel_opencl_h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-apps_GNUmakefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ogr_p_h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ogr_api_cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scripts-GNUmakefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-poppler.diff
</span>
platform darwin {
# see https://trac.macports.org/ticket/55752
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +66,6 @@ depends_lib-append port:zlib \
</span> port:charls
set PYINST ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/"
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +80,7 @@ configure.args-append \
</span> --with-jpeg=internal\
--with-charls=yes \
--with-gif=yes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj=${prefix}/lib/proj5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj=${prefix}/lib/proj6 \
</span> --with-qhull=yes \
--with-pam \
--with-sqlite3=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,13 +369,6 @@ variant cfitsio description {Enable fits support} {
</span> configure.args-delete --without-cfitsio
configure.args-append --with-cfitsio
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OpenCL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opencl description {Use OpenCL for parallel computations} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-opencl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-opencl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-opencl-include=${OPENCLBASE}/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-opencl-lib='-framework OpenCL'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
configure.optflags -DGDAL_COMPILATION
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,7 +377,7 @@ variant proj4 description {Use Proj4 4.9 instead of Proj4 5+} {
</span>
depends_lib-delete port:proj
depends_lib-append port:proj4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-proj=${prefix}/lib/proj5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-proj=${prefix}/lib/proj6
</span> configure.args-append --with-static-proj4=${prefix}/lib/proj49
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -453,7 +438,7 @@ post-destroot {
</span> bin/ogrlineref \
bin/ogrtindex \
bin/testepsg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/libgdal.20.dylib] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/libgdal.26.dylib] \
</span> {
if {${configure.cxx_stdlib} eq "libc++"} {
system "install_name_tool -change \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/MacTypes.diff b/gis/gdal/files/MacTypes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3c0e9e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/MacTypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 58b759a..2c34f41 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@ template <typename T> std::string to_string(T val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <MacTypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define UNKNOWN1 CADHeader::MAX_HEADER_CONSTANT + 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-alg_GNUmakefile.diff b/gis/gdal/files/patch-alg_GNUmakefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 97deb0e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-alg_GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alg/GNUmakefile.old 2015-03-03 20:40:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alg/GNUmakefile 2015-03-03 20:41:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contour.o gdaltransformgeolocs.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal_octave.o gdal_simplesurf.o gdalmatching.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(OGR_ENABLED),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS := -DOGR_ENABLED $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_AVX_AT_COMPILE_TIME),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS := -DHAVE_AVX_AT_COMPILE_TIME $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-apps_GNUmakefile.diff b/gis/gdal/files/patch-apps_GNUmakefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d284f6a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-apps_GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- apps/GNUmakefile.old 2016-05-05 11:32:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ apps/GNUmakefile 2016-05-05 11:32:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testepsg$(EXE) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdalbuildvrt$(EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS := -DOGR_ENABLED $(CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(GNM_ENABLED),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIN_LIST += gnmmanage$(EXE) gnmanalyse$(EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS += -I$(GDAL_ROOT)/gnm
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff b/gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ad2af5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alg/gdalwarpkernel_opencl.cpp.orig 2017-05-18 20:06:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alg/gdalwarpkernel_opencl.cpp 2017-05-18 20:10:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,9 +213,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case CL_INVALID_MIP_LEVEL:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return("CL_INVALID_MIP_LEVEL");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case CL_INVALID_GLOBAL_WORK_SIZE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* case CL_INVALID_GLOBAL_WORK_SIZE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return("CL_INVALID_GLOBAL_WORK_SIZE");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "unknown_error";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff b/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be5a74f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alg/gdalwarpkernel_opencl.h.orig 2012-04-18 14:34:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alg/gdalwarpkernel_opencl.h 2012-04-18 14:35:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <OpenCL/OpenCL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <OpenCL/opencl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CL/opencl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-ogr_api_cpp.diff b/gis/gdal/files/patch-ogr_api_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3c52d22..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-ogr_api_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogr/ogr_api.cpp.old 2016-05-05 11:40:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogr/ogr_api.cpp 2016-05-05 11:40:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPL_CVSID("$Id: ogr_api.cpp 36963 2016-12-19 15:38:17Z rouault $");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define OGR_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool bNonLinearGeometriesEnabled = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /************************************************************************/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-ogr_p_h.diff b/gis/gdal/files/patch-ogr_p_h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff5dfca..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-ogr_p_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ogr/ogr_p.h.old 2015-07-19 12:42:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ogr/ogr_p.h 2015-07-19 12:26:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef OGR_P_H_INCLUDED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OGR_P_H_INCLUDED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "gdal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* -------------------------------------------------------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Include the common portability library ... lets us do lots */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* of stuff easily. */
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2eb892c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-poppler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,301 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Even Rouault <even.rouault@spatialys.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 12 Oct 2018 19:02:40 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/GDALmake.opt.in | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/configure | 61 ++++++++++++++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/configure.ac | 56 +++++++++++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/pdf/GNUmakefile | 4 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/pdf/makefile.vc | 6 +++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/pdf/pdfdataset.cpp | 12 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/nmake.opt | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7 files changed, 111 insertions(+), 31 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 30749ae982a..f9ab41fd124 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GDALmake.opt.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_INC = @POPPLER_INC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/configure b/gdal/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 050bc79ac97..a8472ba8c2d 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -669,6 +669,7 @@ PODOFO_INC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_PODOFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_PLUGIN_LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_INC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_20_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_20_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_23_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for poppler... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_OTHER_POPPLER_VERSION=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $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:#ffe0e0;'>-+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $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:#ffe0e0;'>-+$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_69_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $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:#ffe0e0;'>- $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_INC=$POPPLER_INC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/configure.ac b/gdal/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4b8ab911cec..0c588e04f03 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_20_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_23_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for poppler])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_OTHER_POPPLER_VERSION=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'ocg.getOCGs().size();' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_69_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # And now we check if we have Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f testpoppler.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo '#include <poppler/Object.h>' > testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_58_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_23_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_0_20_OR_LATER=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ POPPLER_HAS_OPTCONTENT=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_OTHER_POPPLER_VERSION=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_RESULT([no])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -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:#ffe0e0;'>- AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(POPPLER_INC, $POPPLER_INC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/pdf/GNUmakefile b/gdal/frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2c332d2798f..6a267f529b2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS += -DPOPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(POPPLER_0_69_OR_LATER),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS += -DPOPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(HAVE_PODOFO),yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS += -DHAVE_PODOFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/pdf/makefile.vc b/gdal/frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b4fa14d0a18..ad76d3de70c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/makefile.vc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !IFDEF POPPLER_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--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:#ffe0e0;'>-+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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !IFDEF POPPLER_HAS_OPTCONTENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !ENDIF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!IFDEF POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+!ENDIF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !ENDIF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !IFDEF PODOFO_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ee89fd07564..1a56f57ee06 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/pdf/pdfdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for( const auto& refOCGPair: optContentConfig->getOCGs() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto ocg = refOCGPair.second.get();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooList* ocgList = optContentConfig->getOCGs();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(int i=0;i<ocgList->getLength();i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( ocg != nullptr && ocg->getName() != nullptr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* pszLayerName = (const char*)ocg->getName()->getCString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bAll = EQUAL(pszLayers, "ALL");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef POPPLER_0_69_OR_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for( const auto& refOCGPair: optContentConfig->getOCGs() )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto ocg = refOCGPair.second.get();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GooList* ocgList = optContentConfig->getOCGs();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(i=0;i<ocgList->getLength();i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/nmake.opt b/gdal/nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 682d766d93e..1eb049038c8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -639,6 +639,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_ENABLED = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_HAS_OPTCONTENT = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -646,6 +647,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_0_20_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_0_23_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #POPPLER_0_58_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#POPPLER_0_69_OR_LATER = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Uncomment for PDF support
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-port-cpl_spawn.cpp.diff b/gis/gdal/files/patch-port-cpl_spawn.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1520350..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-port-cpl_spawn.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://trac.osgeo.org/gdal/changeset/26424
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port/cpl_spawn.cpp (revision 26317)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port/cpl_spawn.cpp (revision 26424)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -465,5 +465,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__APPLE__) && (!defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE==0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-scripts-GNUmakefile.diff b/gis/gdal/files/patch-scripts-GNUmakefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 976b353..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-scripts-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.osgeo.org/gdal/ticket/6607
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://trac.osgeo.org/gdal/changeset/35060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/GNUmakefile.orig 2016-10-24 06:00:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/GNUmakefile 2016-11-25 01:21:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span></pre><pre style='margin:0'>
</pre>