Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2021-10-20 20:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Wed Oct 20 20:23:58 2021 rev:65 rq:926473 version:3.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2021-09-09 23:08:12.444877143 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.1890/gdal.changes 2021-10-20 20:24:51.557399372 +0200 @@ -1,0 +2,7 @@ +Wed Oct 20 06:53:22 UTC 2021 - Guillaume GARDET <[email protected]> + +- Fix build with poppler 2.10: + * gdal-poppler-2.10-a.patch + * gdal-poppler-2.10-b.patch + +------------------------------------------------------------------- New: ---- gdal-poppler-2.10-a.patch gdal-poppler-2.10-b.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.wl7RRP/_old 2021-10-20 20:24:52.253399801 +0200 +++ /var/tmp/diff_new_pack.wl7RRP/_new 2021-10-20 20:24:52.257399804 +0200 @@ -39,6 +39,10 @@ Patch0: gdal-perl.patch # Fix occasional parallel build failure Patch1: GDALmake.opt.in.patch +# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/commit/9c09870e374ca21d558101af3f4c09a6164fdfc3 +Patch2: gdal-poppler-2.10-a.patch +# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/commit/53f969c9c287e4893ff8d9f97ddd1cb25c32dfb4 +Patch3: gdal-poppler-2.10-b.patch BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake ++++++ gdal-poppler-2.10-a.patch ++++++ >From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001 From: Even Rouault <[email protected]> Date: Sun, 26 Sep 2021 22:49:52 +0200 Subject: [PATCH] Fix build against Poppler master --- frmts/pdf/pdfdataset.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp index 9c4c28a6572..50a8154c756 100644 --- a/frmts/pdf/pdfdataset.cpp +++ b/frmts/pdf/pdfdataset.cpp @@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo ) #ifdef HAVE_POPPLER if (bUseLib.test(PDFLIB_POPPLER)) { - GooString* poMetadata = poCatalogPoppler->readMetadata(); + auto poMetadata = poCatalogPoppler->readMetadata(); if (poMetadata) { #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72) @@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo ) const char * const apszMDList[2] = { pszContent, nullptr }; poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP"); } +#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9)) delete poMetadata; +#endif } /* Read Info object */ ++++++ gdal-poppler-2.10-b.patch ++++++ >From 53f969c9c287e4893ff8d9f97ddd1cb25c32dfb4 Mon Sep 17 00:00:00 2001 From: Even Rouault <[email protected]> Date: Tue, 5 Oct 2021 22:45:43 +0200 Subject: [PATCH] PDF: adjust test to Poppler 21.10 --- frmts/pdf/pdfdataset.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp index 50a8154c756..22238bd7482 100644 --- a/frmts/pdf/pdfdataset.cpp +++ b/frmts/pdf/pdfdataset.cpp @@ -5026,7 +5026,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo ) const char * const apszMDList[2] = { pszContent, nullptr }; poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP"); } -#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9)) +#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION < 10)) delete poMetadata; #endif }
