Update gdal_jasper.patch

gdal.spec

@@ -46,7 +46,7 @@
 
 Name:          gdal
 Version:       3.0.4
-Release:       2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
+Release:       3%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -71,6 +71,8 @@ Patch3:        gdal_tirpcinc.patch
 Patch4:        gdal_iso8211.patch
 # Fix makefiles installing libtool wrappers instead of actual executables
 Patch5:        gdal_installapps.patch
+# Fix build against 2.0.22
+Patch6:        gdal_jasper.patch
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -686,6 +688,9 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Wed Jan  6 09:26:27 WET 2021 José Matos <jamatos@fedoraproject.org> - 3.0.4-3
+- rebuild for armadillo 10
+
 * Tue Mar 03 2020 Sandro Mani <manisandro@gmail.com> - 3.0.4-2
 - Fix libtool wrappers installed for gdal utilities instead of actual binaries
 

gdal_jasper.patch

@@ -0,0 +1,31 @@
+diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
+--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp	2020-01-28 11:17:22.000000000 +0100
++++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp	2021-01-15 11:45:46.293701348 +0100
+@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL
+ 
+ {
+     int         iFormat;
+-    char        *pszFormatName = nullptr;
++    const char        *pszFormatName = nullptr;
+ 
+     if (!Identify(poOpenInfo))
+         return nullptr;
+diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2020-01-28 11:17:22.000000000 +0100
++++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2021-01-15 11:45:46.294701417 +0100
+@@ -94,13 +94,13 @@ typedef struct {
+ * File stream object.
+ \******************************************************************************/
+ 
+-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
++static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
+ }
+ 
+-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));