diff --git a/19ba2562.patch b/19ba2562.patch new file mode 100644 index 0000000..b2a2c35 --- /dev/null +++ b/19ba2562.patch @@ -0,0 +1,16 @@ +diff --git a/frmts/pdf/pdfsdk_headers_poppler.h b/frmts/pdf/pdfsdk_headers_poppler.h +index 00cc4067fe5b..d2a3a449d124 100644 +--- a/frmts/pdf/pdfsdk_headers_poppler.h ++++ b/frmts/pdf/pdfsdk_headers_poppler.h +@@ -19,6 +19,11 @@ + + #ifdef HAVE_POPPLER + ++// The "#define private public" hacks we do below do not play well with the ++// sstream header. ++// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051 ++#include ++ + /* Horrible hack because there's a conflict between struct FlateDecode of */ + /* include/poppler/Stream.h and the FlateDecode() function of */ + /* pdfium/core/include/fpdfapi/fpdf_parser.h. */ diff --git a/gdal.changes b/gdal.changes index 4b29d05..cbba211 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 5 08:36:23 UTC 2025 - Bruno Friedmann + +- Add upstream patch 19ba2562.patch to support newer poppler. + fix boo#1235083 + ------------------------------------------------------------------- Thu Nov 7 09:09:26 UTC 2024 - Bruno Friedmann diff --git a/gdal.spec b/gdal.spec index c5de936..afa12cc 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,7 +1,7 @@ # # spec file for package gdal # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,8 @@ URL: https://www.gdal.org/ Source0: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz Source1: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5 Source2: https://download.osgeo.org/%{name}/%{version}/%{sourcename}autotest-%{version}.tar.gz +#UPSTREAM Patch https://github.com/OSGeo/gdal/pull/11473/ +Patch0: 19ba2562.patch BuildRequires: KEALib-devel BuildRequires: bison BuildRequires: blas-devel