gdal: Rebuild with poppler 0.64

This commit is contained in:
Alexey Pavlov
2018-04-24 14:32:54 +03:00
parent 0a24916cf8
commit 3f92c968ee
2 changed files with 17 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
--- 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())));
}

View File

@@ -8,7 +8,7 @@ _realname=gdal
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.2.4
pkgrel=2
pkgrel=3
pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
arch=('any')
url="http://www.gdal.org/"
@@ -50,10 +50,12 @@ options=('strip' 'staticlibs')
source=(http://download.osgeo.org/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.gz
0001-external-qhull-static.patch
0002-libproj4-dll-name.patch)
0002-libproj4-dll-name.patch
0003-poppler-0.64-signature-match.patch)
sha256sums=('b9d5a723787f3006a82cb276db171c721187b048b866c0e20e6df464d671a1a4'
'6952586cd4436003748e8d99f2e8e8a660ba59bdb3c0b294493695ef57f93077'
'392123102d2884dfd91f4cdd89041c2f84467f40a60659cfc65c5e9983c15c6e')
'392123102d2884dfd91f4cdd89041c2f84467f40a60659cfc65c5e9983c15c6e'
'5f6fa979ac79959033e6b171618b95c1e89af7c4b7091807238da57e083f9de5')
prepare() {
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
@@ -70,6 +72,7 @@ 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