summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose17112017-07-28 01:45:34 +0200
committerjose17112017-07-28 01:45:34 +0200
commitbaea3e8ba3854afe6a6e331a247e63fa8a225a1f (patch)
tree11b2b9a8b4ab4e569c7ce38bc28f24751e02a406
parentb4bf83706d276673291dfd08f33f4f5204a11044 (diff)
downloadaur-baea3e8ba3854afe6a6e331a247e63fa8a225a1f.tar.gz
Fix building
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD13
-rw-r--r--jpeg2000.patch11
-rw-r--r--ptr_int_cmp.patch24
4 files changed, 50 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c283ef3370..1439fe47dbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Jun 30 22:15:40 UTC 2017
+# Thu Jul 27 23:44:52 UTC 2017
pkgbase = gdal1
pkgdesc = A translator library for raster geospatial data formats
pkgver = 1.11.5
- pkgrel = 2
+ pkgrel = 3
url = http://www.gdal.org/
changelog = gdal1.changelog
arch = i686
@@ -36,10 +36,14 @@ pkgbase = gdal1
source = gdal-1.5.1-python-install.patch
source = poppler-0.31.patch
source = glibc.patch
+ source = jpeg2000.patch
+ source = ptr_int_cmp.patch
sha256sums = 49f99971182864abed9ac42de10545a92392d88f7dbcfdb11afe449a7eb754fe
sha256sums = 55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6
sha256sums = 4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6
sha256sums = f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f
+ sha256sums = fbc8c12a2e7b368e827b6bd60fbc0192ffd9231feb938d2a798c4a2f064f9e12
+ sha256sums = 0146e06294a2ad32b78cd434af04ddac1c461a62900cec1265f71b53387451b0
pkgname = gdal1
diff --git a/PKGBUILD b/PKGBUILD
index bcfc0b5612d..4b8eef3ae8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=gdal1
_pkgname=gdal
pkgver=1.11.5
-pkgrel=2
+pkgrel=3
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64')
url="http://www.gdal.org/"
@@ -26,15 +26,21 @@ changelog=$pkgname.changelog
source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
gdal-1.5.1-python-install.patch
poppler-0.31.patch
- glibc.patch)
+ glibc.patch
+ jpeg2000.patch
+ ptr_int_cmp.patch)
sha256sums=('49f99971182864abed9ac42de10545a92392d88f7dbcfdb11afe449a7eb754fe'
'55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
'4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
- 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
+ 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f'
+ 'fbc8c12a2e7b368e827b6bd60fbc0192ffd9231feb938d2a798c4a2f064f9e12'
+ '0146e06294a2ad32b78cd434af04ddac1c461a62900cec1265f71b53387451b0')
prepare() {
cd "${srcdir}"/$_pkgname-$pkgver
patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
+ patch -Np0 -i "${srcdir}"/jpeg2000.patch frmts/jpeg2000/jpeg2000_vsil_io.cpp
+ patch -Np1 -i "${srcdir}"/ptr_int_cmp.patch
# patch -Np1 -i "${srcdir}"/poppler-0.31.patch
# patch -Np3 -i "${srcdir}"/glibc.patch
@@ -51,7 +57,6 @@ prepare() {
build() {
cd "${srcdir}"/$_pkgname-$pkgver
export CFLAGS="$CFLAGS -fno-strict-aliasing"
- export CXXFLAGS="$CXXFLAGS -fpermissive"
# bug #23654
export LDFLAGS="$LDFLAGS -Wl,--as-needed"
diff --git a/jpeg2000.patch b/jpeg2000.patch
new file mode 100644
index 00000000000..cab21036727
--- /dev/null
+++ b/jpeg2000.patch
@@ -0,0 +1,11 @@
+--- jpeg2000_vsil_io.cpp.old 2017-07-28 01:08:51.945036712 +0200
++++ jpeg2000_vsil_io.cpp 2017-07-28 00:55:03.743658821 +0200
+@@ -206,7 +206,7 @@
+ /* The buffer must be large enough to accommodate maximum
+ putback. */
+ assert(bufsize > JAS_STREAM_MAXPUTBACK);
+- stream->bufbase_ = JAS_CAST(uchar *, buf);
++ stream->bufbase_ = JAS_CAST(u_char *, buf);
+ stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+ }
+ } else {
diff --git a/ptr_int_cmp.patch b/ptr_int_cmp.patch
new file mode 100644
index 00000000000..12d09868772
--- /dev/null
+++ b/ptr_int_cmp.patch
@@ -0,0 +1,24 @@
+diff -aur gdal-1.11.5/frmts/wms/gdalwmsdataset.cpp gdal-1.11.5.new/frmts/wms/gdalwmsdataset.cpp
+--- gdal-1.11.5/frmts/wms/gdalwmsdataset.cpp 2016-07-01 10:55:06.000000000 +0200
++++ gdal-1.11.5.new/frmts/wms/gdalwmsdataset.cpp 2017-07-28 01:42:12.689071430 +0200
+@@ -380,7 +380,7 @@
+
+ if (ret == CE_None) {
+ const char *pszHttpZeroBlockCodes = CPLGetXMLValue(config, "ZeroBlockHttpCodes", "");
+- if(pszHttpZeroBlockCodes == '\0') {
++ if(*pszHttpZeroBlockCodes == '\0') {
+ m_http_zeroblock_codes.push_back(204);
+ } else {
+ char **kv = CSLTokenizeString2(pszHttpZeroBlockCodes,",",CSLT_HONOURSTRINGS);
+diff -aur gdal-1.11.5/ogr/ogrsf_frmts/vfk/vfkfeature.cpp gdal-1.11.5.new/ogr/ogrsf_frmts/vfk/vfkfeature.cpp
+--- gdal-1.11.5/ogr/ogrsf_frmts/vfk/vfkfeature.cpp 2016-07-01 10:55:03.000000000 +0200
++++ gdal-1.11.5.new/ogr/ogrsf_frmts/vfk/vfkfeature.cpp 2017-07-28 01:41:49.675883164 +0200
+@@ -245,7 +245,7 @@
+ for (poChar = pszLine; *poChar != '\0' && *poChar != ';'; poChar++)
+ /* skip data block name */
+ ;
+- if (poChar == '\0')
++ if (*poChar == '\0')
+ return FALSE; /* nothing to read */
+
+ poChar++; /* skip ';' after data block name*/