aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArTourter <artourter@gmail.com>2021-10-29 21:50:48 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-10-30 23:53:48 +0700
commit2f17659ac8feb7bc85f9fcb85bf723824883c5da (patch)
tree8d11fad3fa1654ab86c7ced63bce06e476531cbb
parentda8577e22aeb888bc4edb980f86d94e47c8630e0 (diff)
gis/gdal: Updated for version 3.3.3
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--gis/gdal/gdal.SlackBuild4
-rw-r--r--gis/gdal/gdal.info6
-rw-r--r--gis/gdal/poppler.patch32
3 files changed, 4 insertions, 38 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index 369e1252e9f1d..5145d7caafda3 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -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=""
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index 4134a7018ba47..ef9c002614553 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -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"
diff --git a/gis/gdal/poppler.patch b/gis/gdal/poppler.patch
deleted file mode 100644
index 208bec000f260..0000000000000
--- a/gis/gdal/poppler.patch
+++ /dev/null
@@ -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 */