gdal: Update to 2.3.1
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
--- gdal-2.2.4/frmts/pdf/pdfobject.cpp 2018-03-19 16:26:54.000000000 +0300
|
||||
+++ gdal-2.2.4/frmts/pdf/pdfobject.cpp 2018-04-24 11:09:49.685426800 +0300
|
||||
@@ -1055,7 +1055,7 @@
|
||||
{
|
||||
if (GetType() == PDFObjectType_String)
|
||||
{
|
||||
- GooString* gooString = m_po->getString();
|
||||
+ const GooString* gooString = m_po->getString();
|
||||
return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
|
||||
static_cast<int>(gooString->getLength())));
|
||||
}
|
||||
@@ -7,8 +7,8 @@
|
||||
_realname=gdal
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.2.4
|
||||
pkgrel=3
|
||||
pkgver=2.3.1
|
||||
pkgrel=1
|
||||
pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
|
||||
arch=('any')
|
||||
url="http://www.gdal.org/"
|
||||
@@ -50,12 +50,10 @@ options=('strip' 'staticlibs')
|
||||
|
||||
source=(http://download.osgeo.org/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.gz
|
||||
0001-external-qhull-static.patch
|
||||
0002-libproj4-dll-name.patch
|
||||
0003-poppler-0.64-signature-match.patch)
|
||||
sha256sums=('b9d5a723787f3006a82cb276db171c721187b048b866c0e20e6df464d671a1a4'
|
||||
0002-libproj4-dll-name.patch)
|
||||
sha256sums=('034456405d3c43d42643ba68685e4a76da71f040f139d7c57b9a12fbf1378223'
|
||||
'6952586cd4436003748e8d99f2e8e8a660ba59bdb3c0b294493695ef57f93077'
|
||||
'392123102d2884dfd91f4cdd89041c2f84467f40a60659cfc65c5e9983c15c6e'
|
||||
'5f6fa979ac79959033e6b171618b95c1e89af7c4b7091807238da57e083f9de5')
|
||||
'392123102d2884dfd91f4cdd89041c2f84467f40a60659cfc65c5e9983c15c6e')
|
||||
|
||||
prepare() {
|
||||
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
|
||||
@@ -72,7 +70,6 @@ prepare() {
|
||||
|
||||
patch -p1 -i ${srcdir}/0001-external-qhull-static.patch
|
||||
patch -p1 -i ${srcdir}/0002-libproj4-dll-name.patch
|
||||
patch -p1 -i ${srcdir}/0003-poppler-0.64-signature-match.patch
|
||||
|
||||
# bug: http://osgeo-org.1560.x6.nabble.com/gdal-dev-jpeg2000-jasper-error-compiling-gdal-2-1-from-git-release-branch-td5299100.html
|
||||
sed -i -e 's@uchar@unsigned char@' frmts/jpeg2000/jpeg2000_vsil_io.cpp
|
||||
|
||||
Reference in New Issue
Block a user