Miroirs/SlackBuildsOrg
1
0
Fork 0
mirror of https://github.com/SlackBuildsOrg/slackbuilds synced 2024-09-30 05:39:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gis/gdal: Updated for version 3.3.3

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
ArTourter 2021-10-29 21:50:48 +01:00 committed by Willy Sudiarto Raharjo
parent da8577e22a
commit 2f17659ac8
No known key found for this signature in database
GPG key ID: 3F617144D7238786
3 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gis/gdal/gdal.SlackBuild
View file

@ -29,7 +29,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=gdal
VERSION=${VERSION:-3.3.2}
VERSION=${VERSION:-3.3.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@ -83,8 +83,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
patch -p2 < $CWD/poppler.patch
# OpenCL, webp, Spatialite and Grass support need special arrangements.
# Everything else is handled automatically by configure.
WITHLIST=""

6
gis/gdal/gdal.info
View file

@ -1,8 +1,8 @@
PRGNAM="gdal"
VERSION="3.3.2"
VERSION="3.3.3"
HOMEPAGE="https://www.gdal.org/"
DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.3.2/gdal-3.3.2.tar.gz"
MD5SUM="fd82c580ec9e16a0a46cd176243a8a56"
DOWNLOAD="https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz"
MD5SUM="1d8571b7ad1546d95e6493be77fd49a8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="geos proj"

32
gis/gdal/poppler.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
---
gdal/frmts/pdf/pdfdataset.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 9c4c28a6572..50a8154c756 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/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 */