diff --git a/mingw-w64-gdal/006-fix-build-against-podofo.patch b/mingw-w64-gdal/006-fix-build-against-podofo.patch deleted file mode 100644 index 48c06d8a58..0000000000 --- a/mingw-w64-gdal/006-fix-build-against-podofo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/frmts/pdf/pdfdataset.cpp -+++ b/frmts/pdf/pdfdataset.cpp -@@ -54,6 +54,10 @@ - #include - #include - #include -+ -+#ifdef GetObject -+#undef GetObject -+#endif - - #ifdef HAVE_PDFIUM - // To be able to use diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD index 3ebd4097b6..edaac2e3fb 100644 --- a/mingw-w64-gdal/PKGBUILD +++ b/mingw-w64-gdal/PKGBUILD @@ -8,8 +8,8 @@ _realname=gdal pkgbase=mingw-w64-${_realname,,} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=3.9.0 -pkgrel=11 +pkgver=3.9.3 +pkgrel=1 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -80,18 +80,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zstd") source=(https://github.com/OSGeo/gdal/releases/download/v${pkgver}/gdal-${pkgver}.tar.gz 001-fix-bindings-install-path.patch - 002-remove-manual-soversion.patch - 003-fix-build-with-gcc-14.patch::https://github.com/OSGeo/gdal/commit/899f880d.patch - 004-fix-build-with-c++20.patch::https://github.com/OSGeo/gdal/commit/7b526b12.patch - 005-fix-build-with-c++20-p2.patch::https://github.com/OSGeo/gdal/commit/25cfe3b8.patch - 006-fix-build-against-podofo.patch) -sha256sums=('3b29b573b60d156cf160805290474b625c4197ca36a79fd14f83ec8f77f29ba0' + 002-remove-manual-soversion.patch) +sha256sums=('f293d8ccc6b98f617db88f8593eae37f7e4b32d49a615b2cba5ced12c7bebdae' 'bfb0b42c8562bd45ae5cff71d42b042e398dff9a9c1f5bb08d8717a7753d4f3f' - 'fc815a58fe229db3c44bae15f405cafbeb82de91ec3f35564569c5bbecb1c3d7' - 'f8b1fa56dfde3c606f7620402e0a38a4f40fa982ac9f430d010decc3ab17111c' - 'f6f339d2292c5d53b1a042bc5d9ffe6c39b8e705664220a5eed4afe77e2e5759' - '1c1c59f6e90a9e0185b2ea24520c501367c62b45a3518464adbd7df44ff98541' - '9addf6543b985e3b5341879c135f100c3305ec750e8256939177e6065f66b88b') + 'fc815a58fe229db3c44bae15f405cafbeb82de91ec3f35564569c5bbecb1c3d7') apply_patch_with_msg() { for _patch in "$@" @@ -105,11 +97,7 @@ prepare() { cd ${srcdir}/${_realname}-${pkgver} apply_patch_with_msg \ 001-fix-bindings-install-path.patch \ - 002-remove-manual-soversion.patch \ - 003-fix-build-with-gcc-14.patch \ - 004-fix-build-with-c++20.patch \ - 005-fix-build-with-c++20-p2.patch \ - 006-fix-build-against-podofo.patch + 002-remove-manual-soversion.patch } build() {