* update gdal to 3.8.5-6

gdal/PKGBUILD

@@ -7,7 +7,7 @@
 pkgbase=gdal
 pkgname=(gdal python-gdal)
 pkgver=3.8.5
-pkgrel=4
+pkgrel=6
 pkgdesc="A translator library for raster and vector geospatial data formats"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://gdal.org/"
@@ -21,8 +21,14 @@ 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)
-b2sums=('2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349')
+source=(https://download.osgeo.org/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz
+        https://github.com/OSGeo/gdal/commit/7b526b12.patch)
+b2sums=('2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349'
+        '801eb649c20ef81d7590888589d4049eab4505fac6efbe1718d8bc9e01a35390b9d8cad090c3421ff90d769fe3f5aec4d1641409ecc5a434ba68c4c5d30eec85')
+
+prepare() {
+  patch -d $pkgbase-$pkgver -p1 < 7b526b12.patch # Fix build with C++20
+}
 
 build() {
   case "${CARCH}" in
@@ -38,9 +44,8 @@ build() {
   esac
 
   cmake -B build -S $pkgbase-$pkgver \
-    ${_cmake_options[@]} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_CXX_STANDARD=17 \
+    -DCMAKE_CXX_STANDARD=20 \
     -DENABLE_IPO=ON \
     -DBUILD_PYTHON_BINDINGS=ON \
     -DGDAL_ENABLE_PLUGINS=ON \