pool/gdal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 926472 from home:Guillaume_G:branches:Application:Geo

Browse Source 
- Fix build with poppler 2.10:
  * gdal-poppler-2.10-a.patch
  * gdal-poppler-2.10-b.patch

OBS-URL: https://build.opensuse.org/request/show/926472
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=142
This commit is contained in:
Bruno Friedmann 2021-10-20 07:20:34 +00:00 committed by Git OBS Bridge
parent 050a7134b1
commit 56fa3d514b
4 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gdal-poppler-2.10-a.patch Normal file
View File

@ -0,0 +1,32 @@
From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
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 */

22
gdal-poppler-2.10-b.patch Normal file
View File

@ -0,0 +1,22 @@
From 53f969c9c287e4893ff8d9f97ddd1cb25c32dfb4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
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
}

7
gdal.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 20 06:53:22 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Fix build with poppler 2.10:
* gdal-poppler-2.10-a.patch
* gdal-poppler-2.10-b.patch
-------------------------------------------------------------------
Tue Sep 7 19:18:02 UTC 2021 - Bruno Friedmann <bruno@ioda-net.ch>

4
gdal.spec
View File

@ -39,6 +39,10 @@ Source2: https://download.osgeo.org/%{name}/%{version}/%{sourcename}autot
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