diff --git a/gdal-3.4.1.tar.xz b/gdal-3.4.1.tar.xz deleted file mode 100644 index d27f63c..0000000 --- a/gdal-3.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:332f053516ca45101ef0f7fa96309b64242688a8024780a5d93be0230e42173d -size 13257288 diff --git a/gdal-3.4.1.tar.xz.md5 b/gdal-3.4.1.tar.xz.md5 deleted file mode 100644 index 1662861..0000000 --- a/gdal-3.4.1.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -6c42056c81abf84edcb2022b53fb2974 gdal-3.4.1.tar.xz diff --git a/gdal-3.4.2.tar.xz b/gdal-3.4.2.tar.xz new file mode 100644 index 0000000..def89e3 --- /dev/null +++ b/gdal-3.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16baf03dfccf9e3f72bb2e15cd2d5b3f4be0437cdff8a785bceab0c7be557335 +size 13273280 diff --git a/gdal-3.4.2.tar.xz.md5 b/gdal-3.4.2.tar.xz.md5 new file mode 100644 index 0000000..c7eaf47 --- /dev/null +++ b/gdal-3.4.2.tar.xz.md5 @@ -0,0 +1 @@ +4b6ac60068a60059a31e125b2a169d86 gdal-3.4.2.tar.xz diff --git a/gdal-fix-build-poppler.patch b/gdal-fix-build-poppler.patch deleted file mode 100644 index 1651957..0000000 --- a/gdal-fix-build-poppler.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2d5f96f233e6bda613e98e056bb9a39d12409e32 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Fri, 18 Feb 2022 22:47:01 +0100 -Subject: [PATCH] PDF: fix build against Poppler > 22.2 - ---- - gdal/frmts/pdf/pdfdataset.cpp | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -Index: gdal-3.4.1/frmts/pdf/pdfdataset.cpp -=================================================================== ---- gdal-3.4.1.orig/frmts/pdf/pdfdataset.cpp -+++ gdal-3.4.1/frmts/pdf/pdfdataset.cpp -@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn - #ifdef HAVE_POPPLER - if(bUseLib.test(PDFLIB_POPPLER)) - { -- GooString* poUserPwd = nullptr; -- - static bool globalParamsCreatedByGDAL = false; - { - CPLMutexHolderD(&hGlobalParamsMutex); -@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn - while( true ) - { - VSIFSeekL(fp, 0, SEEK_SET); -- if (pszUserPwd) -- poUserPwd = new GooString(pszUserPwd); -- - g_nPopplerErrors = 0; - if( globalParamsCreatedByGDAL ) - registerErrorCallback(); -@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenIn - oObj.getObj()->initNull(); - auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj()); - #endif -+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2) -+ std::optional osUserPwd; -+ if (pszUserPwd) -+ osUserPwd = std::optional(pszUserPwd); -+ poDocPoppler = new PDFDoc(poStream, std::optional(), osUserPwd); -+#else -+ GooString* poUserPwd = nullptr; -+ if (pszUserPwd) -+ poUserPwd = new GooString(pszUserPwd); - poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd); -+ delete poUserPwd; -+#endif - if( globalParamsCreatedByGDAL ) - registerErrorCallback(); -- delete poUserPwd; - if( g_nPopplerErrors >= MAX_POPPLER_ERRORS ) - { - PDFFreeDoc(poDocPoppler); diff --git a/gdal-fix-poppler-leap.patch b/gdal-fix-poppler-leap.patch deleted file mode 100644 index 5fab923..0000000 --- a/gdal-fix-poppler-leap.patch +++ /dev/null @@ -1,46 +0,0 @@ -# -# spec file -# -# Copyright (c) 2022 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -From cbcfe2c8c5507ea00ef7371029ff94d0bf6f4a77 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 8 Jan 2022 14:25:09 +0100 -Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes - #5071) - ---- - gdal/frmts/pdf/GNUmakefile | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: gdal-3.4.1/frmts/pdf/GNUmakefile -=================================================================== ---- gdal-3.4.1.orig/frmts/pdf/GNUmakefile -+++ gdal-3.4.1/frmts/pdf/GNUmakefile -@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle - endif - - ifeq ($(HAVE_POPPLER),yes) -+# Poppler 2022.1 requires c++17 -+ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) -+CXX := $(subst -std=c++11,,${CXX}) -+CXX := $(subst -std=c++14,,${CXX}) -+CXX := ${CXX} -std=c++17 -+endif - CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) - endif - -%changelog diff --git a/gdal.changes b/gdal.changes index d66f3e1..06259b6 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 15 19:33:40 UTC 2022 - Bruno Friedmann + +- Update to version 3.4.2 bugfix release + See changelog https://github.com/OSGeo/gdal/blob/v3.4.2/gdal/NEWS.md +- Remove merged upstream patches gdal-fix-poppler-leap.patch + and gdal-fix-build-poppler.patch + ------------------------------------------------------------------- Tue Mar 8 14:47:15 UTC 2022 - Bjørn Lie diff --git a/gdal.spec b/gdal.spec index 09d44c1..3e96766 100644 --- a/gdal.spec +++ b/gdal.spec @@ -29,7 +29,7 @@ %bcond_with heif_support %bcond_with tests_support Name: gdal -Version: 3.4.1 +Version: 3.4.2 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 @@ -37,12 +37,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 +#PATCH-FIX-OPENSUSE set proper perl install directories Patch0: gdal-perl.patch -# PATCH-FIX-UPSTREAM gdal-fix-build-poppler.patch -- Fix build with poppler 22.03.0 and newer -Patch1: gdal-fix-build-poppler.patch -# PATCH-FIX-UPSTREAM gdal-fix-poppler-leap.patch -- Fix build on Leap 15.4 and poppler -Patch2: gdal-fix-poppler-leap.patch - BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake diff --git a/gdalautotest-3.4.1.tar.gz b/gdalautotest-3.4.1.tar.gz deleted file mode 100644 index 05e871d..0000000 --- a/gdalautotest-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30e328099ecb79754613785f354765f506d49815554babdbbc8d8460d68b45ec -size 49233920 diff --git a/gdalautotest-3.4.2.tar.gz b/gdalautotest-3.4.2.tar.gz new file mode 100644 index 0000000..fd1dd13 --- /dev/null +++ b/gdalautotest-3.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95b8abd697fb0576b8a6dc009fed6a557944c3a5869bc218722541c19f52bff9 +size 49571840