gdal/gdal-g2clib.patch

Index: gdal-2.2.3-fedora/frmts/grib/GNUmakefile
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/GNUmakefile
+++ gdal-2.2.3-fedora/frmts/grib/GNUmakefile
@@ -7,8 +7,7 @@ include ../../GDALmake.opt
 OBJ	=	gribdataset.o \
                 clock.o \
                 degrib1.o \
-                degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o gridtemplates.o drstemplates.o pdstemplates.o gbits.o g2_free.o g2_unpack1.o g2_unpack2.o g2_unpack3.o g2_unpack4.o g2_unpack5.o g2_unpack6.o g2_unpack7.o g2_info.o g2_getfld.o simunpack.o comunpack.o pack_gp.o reduce.o specpack.o specunpack.o rdieee.o mkieee.o int_power.o simpack.o compack.o cmplxpack.o misspack.o g2_create.o g2_addlocal.o g2_addgrid.o g2_addfield.o g2_gribend.o getdim.o g2_miss.o getpoly.o seekgb.o \
-		dec_jpeg2000.o jpcunpack.o jpcpack.o enc_jpeg2000.o
+                degrib2.o inventory.o metaname.o myerror.o tdlpack.o filedatasource.o memorydatasource.o grib1tab.o myutil.o metaparse.o weather.o metaprint.o engribapi.o grib2api.o myassert.o scan.o memendian.o fileendian.o 
 
 ifeq ($(PNG_SETTING),internal)
 EXTRAFLAGS      :=      $(EXTRAFLAGS) -I../png/libpng -DUSE_PNG
@@ -20,7 +19,7 @@ endif
 
 ifeq ($(PNG_SETTING),external)
 EXTRAFLAGS      :=      $(EXTRAFLAGS) -DUSE_PNG
-OBJ     :=      $(OBJ) pngpack.o pngunpack.o enc_png.o dec_png.o
+OBJ     :=      $(OBJ)
 endif
 
 CPPFLAGS	:=	 $(CPPFLAGS) $(EXTRAFLAGS)
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/engribapi.c
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/engribapi.c
@@ -419,7 +419,6 @@ int fillSect3 (enGribMeta *en, uShort2 t
                double meshLat, double orientLon, double scaleLat1,
                double scaleLat2, double southLat, double southLon)
 {
-   const struct gridtemplate *templatesgrid = get_templatesgrid();
    int i;               /* loop counter over number of GDS templates. */
    double unit;         /* Used to convert from stored value to degrees
                          * lat/lon. See GRIB2 Regulation 92.1.6 */
@@ -641,7 +640,6 @@ int fillSect4_0 (enGribMeta *en, uShort2
                  double dSurfVal2)
 {
    int i;               /* loop counter over number of PDS templates. */
-   const struct pdstemplate *templatespds = get_templatespds();
 
    /* analysis template (0) */
    /* In addition templates (1, 2, 5, 8, 9, 12) begin with 4.0 info. */
@@ -1197,7 +1195,6 @@ int fillSect5 (enGribMeta *en, uShort2 t
                uChar orderOfDiff)
 {
    int i;               /* loop counter over number of DRS templates. */
-   const struct drstemplate *templatesdrs = get_templatesdrs();
 
    /* Find NCEP's template match */
    for (i = 0; i < MAXDRSTEMP; i++) {
Index: gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
===================================================================
--- gdal-2.2.3-fedora.orig/frmts/grib/degrib18/degrib/grib2api.c
+++ gdal-2.2.3-fedora/frmts/grib/degrib18/degrib/grib2api.c
@@ -961,7 +961,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
    }
    curIndex = 14;
    for (i = 0; i < gfld->igdtlen; i++) {
-      const struct gridtemplate *templatesgrid = get_templatesgrid();
       is3[curIndex] = gfld->igdtmpl[i];
       curIndex += abs (templatesgrid[gridIndex].mapgrid[i]);
    }
@@ -1029,7 +1028,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
    }
    curIndex = 9;
    for (i = 0; i < gfld->ipdtlen; i++) {
-      const struct pdstemplate *templatespds = get_templatespds();
       is4[curIndex] = gfld->ipdtmpl[i];
       curIndex += abs (templatespds[pdsIndex].mappds[i]);
    }
@@ -1047,7 +1045,6 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
    }
    curIndex = 11;
    for (i = 0; i < gfld->idrtlen; i++) {
-      const struct drstemplate *templatesdrs = get_templatesdrs();
       is5[curIndex] = gfld->idrtmpl[i];
       curIndex += abs (templatesdrs[drsIndex].mapdrs[i]);
    }