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

Accepting request 928923 from Application:Geo

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/928923
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdal?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2021-11-03 16:26:04 +00:00 committed by Git OBS Bridge
commit cbb7ad725b
10 changed files with 20 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdal-3.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:630e34141cf398c3078d7d8f08bb44e804c65bbf09807b3610dcbfbc37115cc3
size 12940900

1
gdal-3.3.2.tar.xz.md5
View File

@ -1 +0,0 @@
3a4071fc446182c7b2d71f3939d0c383 gdal-3.3.2.tar.xz

3
gdal-3.3.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e8fc8b19c77238c7f4c27857d04857b65d8b7e8050d3aac256d70fa48a21e76
size 12946356

1
gdal-3.3.3.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
9e42f3d11e2fb619b522878901bd1b0f gdal-3.3.3.tar.xz

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

@ -1,32 +0,0 @@
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
View File

@ -1,22 +0,0 @@
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
}

15
gdal.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Nov 1 08:16:50 UTC 2021 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to version 3.3.3 bugfix release
+ Full changelog https://github.com/OSGeo/gdal/blob/v3.3.3/gdal/NEWS
- Removed upstream patches
+ gdal-poppler-2.10-a.patch
+ gdal-poppler-2.10-b.patch
-------------------------------------------------------------------
Wed Oct 20 06:53:22 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
@ -8,15 +17,15 @@ Wed Oct 20 06:53:22 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
-------------------------------------------------------------------
Tue Sep 7 19:18:02 UTC 2021 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to version 3.3.2 bugfix release
+ Full changelog
- Update to version 3.3.2 bugfix release
+ Full changelog
https://github.com/OSGeo/gdal/blob/v3.3.2/gdal/NEWS
-------------------------------------------------------------------
Sun Jul 11 19:48:30 UTC 2021 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to version 3.3.1 bugfix release
+ Full changelog
+ Full changelog
https://github.com/OSGeo/gdal/blob/v3.3.1/gdal/NEWS
-------------------------------------------------------------------

6
gdal.spec
View File

@ -28,7 +28,7 @@
%bcond_with heif_support
%bcond_with tests_support
Name: gdal
Version: 3.3.2
Version: 3.3.3
Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: BSD-3-Clause AND MIT AND SUSE-Public-Domain
@ -39,10 +39,6 @@ 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

3
gdalautotest-3.3.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f541536036c7f82096cc7d9ddf0dd389ea19b18fbb2f3d14d621a283e7db221
size 40755200

3
gdalautotest-3.3.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62eebb6c1437938e007f4065d663163fc449b2561491d51f6c27b917da66114c
size 40847360