Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / gdal
Commits:
97e2cfeb by Antonio Rojas at 2025-02-05T20:29:38+01:00
upgpkg: 3.10.1-1: Update to 3.10.1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − fix_build_with_poppler_24.12.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = gdal
pkgdesc = A translator library for raster and vector geospatial data
formats
- pkgver = 3.10.0
- pkgrel = 7
+ pkgver = 3.10.1
+ pkgrel = 1
url = https://gdal.org/
changelog = gdal.changelog
arch = x86_64
@@ -52,10 +52,8 @@ pkgbase = gdal
makedepends = zlib
makedepends = zstd
makedepends = libaec
- source = https://download.osgeo.org/gdal/3.10.0/gdal-3.10.0.tar.xz
- source = fix_build_with_poppler_24.12.patch
- b2sums =
edb4ad94ef22de0dbcffb64b0009b7f771d8a6a7288457e414518c741c375097bf5f6d892d108ef134f8be2af8c3ded9ba9b41119f31204322b993142c3ed7d1
- b2sums =
2ff96109e8e16a96b6acdf3c7396c909025ad479a6c140eeda3f082e759f8dcdab43242c9687717bc85adb0b0c1fd6d0b6224a064d45e261e491cd436260118b
+ source = https://download.osgeo.org/gdal/3.10.1/gdal-3.10.1.tar.xz
+ b2sums =
aa5cc05a980d5c4f2c8e6f1685252178b8845eff33f40e35960e3389d91519868d4f4c3c2aed5f5e4ebb91fb3fb8a336e1af8f7a0f4e4e3584039eb5385e4b45
pkgname = gdal
depends = proj
@@ -102,5 +100,5 @@ pkgname = gdal
pkgname = python-gdal
pkgdesc = Python bindings for GDAL
- depends = gdal=3.10.0
+ depends = gdal=3.10.1
depends = python-numpy
=====================================
PKGBUILD
=====================================
@@ -5,8 +5,8 @@
pkgbase=gdal
pkgname=(gdal python-gdal)
-pkgver=3.10.0
-pkgrel=7
+pkgver=3.10.1
+pkgrel=1
pkgdesc="A translator library for raster and vector geospatial data formats"
arch=(x86_64)
url="https://gdal.org/";
@@ -20,17 +20,8 @@ makedepends=(cmake opencl-headers python-setuptools
python-numpy
# armadillo basisu brunsli lerc libkml qb3 rasterlite2 sfcgal tiledb
# ogdi
changelog=$pkgbase.changelog
-source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
- fix_build_with_poppler_24.12.patch)
-b2sums=('edb4ad94ef22de0dbcffb64b0009b7f771d8a6a7288457e414518c741c375097bf5f6d892d108ef134f8be2af8c3ded9ba9b41119f31204322b993142c3ed7d1'
-
'2ff96109e8e16a96b6acdf3c7396c909025ad479a6c140eeda3f082e759f8dcdab43242c9687717bc85adb0b0c1fd6d0b6224a064d45e261e491cd436260118b')
-
-prepare() {
- cd $pkgbase-$pkgver
- # Temporary patch to fix build with poppler 24.12
- # See
https://github.com/OSGeo/gdal/commit/19ba2562b506f628e0f023774fdb52ada656f95b
- patch -Np1 < $srcdir/fix_build_with_poppler_24.12.patch
-}
+source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz)
+b2sums=('aa5cc05a980d5c4f2c8e6f1685252178b8845eff33f40e35960e3389d91519868d4f4c3c2aed5f5e4ebb91fb3fb8a336e1af8f7a0f4e4e3584039eb5385e4b45')
build() {
cmake -B build -S $pkgbase-$pkgver \
=====================================
fix_build_with_poppler_24.12.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 19ba2562b506f628e0f023774fdb52ada656f95b Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.roua...@spatialys.com>
-Date: Mon, 9 Dec 2024 18:18:31 +0100
-Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc
- 13.3)
-
-Cf
https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
----
- frmts/pdf/pdfsdk_headers_poppler.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/frmts/pdf/pdfsdk_headers_poppler.h
b/frmts/pdf/pdfsdk_headers_poppler.h
-index 00cc4067fe5b..d2a3a449d124 100644
---- a/frmts/pdf/pdfsdk_headers_poppler.h
-+++ b/frmts/pdf/pdfsdk_headers_poppler.h
-@@ -19,6 +19,11 @@
-
- #ifdef HAVE_POPPLER
-
-+// The "#define private public" hacks we do below do not play well with the
-+// sstream header.
-+// Cf
https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
-+#include <sstream>
-+
- /* Horrible hack because there's a conflict between struct FlateDecode of */
- /* include/poppler/Stream.h and the FlateDecode() function of */
- /* pdfium/core/include/fpdfapi/fpdf_parser.h. */
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gdal/-/commit/97e2cfeb9ea0786d88c1b032cc79b3e8b9b04cc3
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gdal/-/commit/97e2cfeb9ea0786d88c1b032cc79b3e8b9b04cc3
You're receiving this email because of your account on gitlab.archlinux.org.
