From 6ff18a28cc8cf8158a3852f5f7ab4aebf2a7a10f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 14 Mar 2022 23:51:48 +0100 Subject: [PATCH] Update to 3.4.2 --- .gitignore | 2 ++ gdal-gcc11.patch | 18 +++++++++--------- gdal.spec | 9 ++++++--- gdal_autoconf270.patch | 6 +++--- gdal_installapps.patch | 6 +++--- gdal_iso8211.patch | 6 +++--- gdal_java.patch | 18 +++++++++--------- gdal_no-diag-disable.patch | 6 +++--- gdal_nopdf.patch | 6 +++--- gdal_sphinx.patch | 6 +++--- gdal_tirpcinc.patch | 12 ++++++------ sources | 4 ++-- 12 files changed, 52 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 0a49695..0499d5b 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.4.0.tar.gz /gdal-3.4.1-fedora.tar.xz /gdalautotest-3.4.1.tar.gz +/gdal-3.4.2-fedora.tar.xz +/gdalautotest-3.4.2.tar.gz diff --git a/gdal-gcc11.patch b/gdal-gcc11.patch index 98e14d7..221fc4d 100644 --- a/gdal-gcc11.patch +++ b/gdal-gcc11.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp ---- gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-12-27 21:26:29.000000000 +0100 -+++ gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2022-01-04 13:58:03.552554655 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp +--- gdal-3.4.2-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2022-03-08 11:12:11.000000000 +0100 ++++ gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2022-03-14 23:50:44.828159269 +0100 @@ -34,6 +34,7 @@ #include #include @@ -9,9 +9,9 @@ diff -rupN --no-dereference gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cad //------------------------------------------------------------------------------ // CADVector -diff -rupN --no-dereference gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ---- gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-12-27 21:26:28.000000000 +0100 -+++ gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2022-01-04 13:58:03.552554655 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +--- gdal-3.4.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2022-03-08 11:12:10.000000000 +0100 ++++ gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2022-03-14 23:50:44.828159269 +0100 @@ -39,6 +39,7 @@ #include #include @@ -20,9 +20,9 @@ diff -rupN --no-dereference gdal-3.4.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string -diff -rupN --no-dereference gdal-3.4.1-fedora/third_party/LercLib/Lerc2.h gdal-3.4.1-fedora-new/third_party/LercLib/Lerc2.h ---- gdal-3.4.1-fedora/third_party/LercLib/Lerc2.h 2021-12-27 21:25:37.000000000 +0100 -+++ gdal-3.4.1-fedora-new/third_party/LercLib/Lerc2.h 2022-01-04 13:58:03.553554660 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/third_party/LercLib/Lerc2.h gdal-3.4.2-fedora-new/third_party/LercLib/Lerc2.h +--- gdal-3.4.2-fedora/third_party/LercLib/Lerc2.h 2022-03-08 11:11:18.000000000 +0100 ++++ gdal-3.4.2-fedora-new/third_party/LercLib/Lerc2.h 2022-03-14 23:50:44.829159267 +0100 @@ -30,6 +30,7 @@ Contributors: Thomas Maurer #include #include diff --git a/gdal.spec b/gdal.spec index 0b7c8b9..d6c9af4 100644 --- a/gdal.spec +++ b/gdal.spec @@ -8,7 +8,7 @@ #TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO # Tests can be of a different version -%global testversion 3.4.1 +%global testversion 3.4.2 %global run_tests 1 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) @@ -43,8 +43,8 @@ %endif Name: gdal -Version: 3.4.1 -Release: 6%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Version: 3.4.2 +Release: 1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -635,6 +635,9 @@ popd #Or as before, using ldconfig %changelog +* Mon Mar 14 2022 Sandro Mani - 3.4.2-1 +- Update to 3.4.2 + * Thu Mar 10 2022 Sandro Mani - 3.4.1-6 - Rebuild for proj-9.0.0 diff --git a/gdal_autoconf270.patch b/gdal_autoconf270.patch index b23ad7d..9f843e7 100644 --- a/gdal_autoconf270.patch +++ b/gdal_autoconf270.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/m4/lib-link.m4 gdal-3.4.1-fedora-new/m4/lib-link.m4 ---- gdal-3.4.1-fedora/m4/lib-link.m4 2021-12-27 21:26:46.000000000 +0100 -+++ gdal-3.4.1-fedora-new/m4/lib-link.m4 2022-01-04 13:58:04.019556695 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/m4/lib-link.m4 gdal-3.4.2-fedora-new/m4/lib-link.m4 +--- gdal-3.4.2-fedora/m4/lib-link.m4 2022-03-08 11:12:26.000000000 +0100 ++++ gdal-3.4.2-fedora-new/m4/lib-link.m4 2022-03-14 23:50:45.320158106 +0100 @@ -108,8 +108,6 @@ dnl acl_hardcode_direct, dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], diff --git a/gdal_installapps.patch b/gdal_installapps.patch index 3f0914a..36053ab 100644 --- a/gdal_installapps.patch +++ b/gdal_installapps.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/apps/GNUmakefile gdal-3.4.1-fedora-new/apps/GNUmakefile ---- gdal-3.4.1-fedora/apps/GNUmakefile 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/apps/GNUmakefile 2022-01-04 13:58:03.039552414 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/apps/GNUmakefile gdal-3.4.2-fedora-new/apps/GNUmakefile +--- gdal-3.4.2-fedora/apps/GNUmakefile 2022-03-08 11:10:52.000000000 +0100 ++++ gdal-3.4.2-fedora-new/apps/GNUmakefile 2022-03-14 23:50:44.391160302 +0100 @@ -232,6 +232,7 @@ gdal-config-inst: gdal-config.in ../GDAL install: default diff --git a/gdal_iso8211.patch b/gdal_iso8211.patch index fc112db..7c0decc 100644 --- a/gdal_iso8211.patch +++ b/gdal_iso8211.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/frmts/iso8211/GNUmakefile gdal-3.4.1-fedora-new/frmts/iso8211/GNUmakefile ---- gdal-3.4.1-fedora/frmts/iso8211/GNUmakefile 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/frmts/iso8211/GNUmakefile 2022-01-04 13:58:02.496550043 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/frmts/iso8211/GNUmakefile gdal-3.4.2-fedora-new/frmts/iso8211/GNUmakefile +--- gdal-3.4.2-fedora/frmts/iso8211/GNUmakefile 2022-03-08 11:10:53.000000000 +0100 ++++ gdal-3.4.2-fedora-new/frmts/iso8211/GNUmakefile 2022-03-14 23:50:43.943161361 +0100 @@ -23,8 +23,7 @@ dist-clean: clean rm -rf $(DISTDIR) diff --git a/gdal_java.patch b/gdal_java.patch index 89e054d..f6c42e1 100644 --- a/gdal_java.patch +++ b/gdal_java.patch @@ -1,6 +1,6 @@ -diff -rupN gdal-3.4.1-fedora/swig/java/add_javadoc.c gdal-3.4.1-fedora-new/swig/java/add_javadoc.c ---- gdal-3.4.1-fedora/swig/java/add_javadoc.c 2021-12-27 21:25:14.000000000 +0100 -+++ gdal-3.4.1-fedora-new/swig/java/add_javadoc.c 2022-01-04 15:09:34.166703455 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/swig/java/add_javadoc.c gdal-3.4.2-fedora-new/swig/java/add_javadoc.c +--- gdal-3.4.2-fedora/swig/java/add_javadoc.c 2022-03-08 11:10:55.000000000 +0100 ++++ gdal-3.4.2-fedora-new/swig/java/add_javadoc.c 2022-03-14 23:50:43.455162515 +0100 @@ -142,21 +142,21 @@ int main(int argc, char* argv[]) JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000); int nInstances = 0; @@ -67,9 +67,9 @@ diff -rupN gdal-3.4.1-fedora/swig/java/add_javadoc.c gdal-3.4.1-fedora-new/swig/ } while(bFoundOpen == FALSE || nBrackets > 0); } else -diff -rupN gdal-3.4.1-fedora/swig/java/javadoc.java gdal-3.4.1-fedora-new/swig/java/javadoc.java ---- gdal-3.4.1-fedora/swig/java/javadoc.java 2021-12-27 21:25:14.000000000 +0100 -+++ gdal-3.4.1-fedora-new/swig/java/javadoc.java 2022-01-04 15:07:38.528621112 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/swig/java/javadoc.java gdal-3.4.2-fedora-new/swig/java/javadoc.java +--- gdal-3.4.2-fedora/swig/java/javadoc.java 2022-03-08 11:10:55.000000000 +0100 ++++ gdal-3.4.2-fedora-new/swig/java/javadoc.java 2022-03-14 23:50:43.456162513 +0100 @@ -11982,12 +11982,12 @@ public interface osrConstants:public fin public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM @@ -85,9 +85,9 @@ diff -rupN gdal-3.4.1-fedora/swig/java/javadoc.java gdal-3.4.1-fedora-new/swig/j * or iterative convergence method failed. */ public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN -diff -rupN gdal-3.4.1-fedora/swig/java/java.opt gdal-3.4.1-fedora-new/swig/java/java.opt ---- gdal-3.4.1-fedora/swig/java/java.opt 2021-12-27 21:25:12.000000000 +0100 -+++ gdal-3.4.1-fedora-new/swig/java/java.opt 2022-01-04 15:07:38.529621181 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/swig/java/java.opt gdal-3.4.2-fedora-new/swig/java/java.opt +--- gdal-3.4.2-fedora/swig/java/java.opt 2022-03-08 11:10:53.000000000 +0100 ++++ gdal-3.4.2-fedora-new/swig/java/java.opt 2022-03-14 23:50:43.457162510 +0100 @@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc JAVAC=$(JAVA_HOME)/bin/javac JAVA=$(JAVA_HOME)/bin/java diff --git a/gdal_no-diag-disable.patch b/gdal_no-diag-disable.patch index 911dd8b..fdbc99a 100644 --- a/gdal_no-diag-disable.patch +++ b/gdal_no-diag-disable.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/configure.ac gdal-3.4.1-fedora-new/configure.ac ---- gdal-3.4.1-fedora/configure.ac 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/configure.ac 2022-01-04 13:58:03.791555699 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/configure.ac gdal-3.4.2-fedora-new/configure.ac +--- gdal-3.4.2-fedora/configure.ac 2022-03-08 11:10:52.000000000 +0100 ++++ gdal-3.4.2-fedora-new/configure.ac 2022-03-14 23:50:45.076158683 +0100 @@ -73,7 +73,7 @@ dnl warning #2304: non-explicit construc dnl warning #3280: declaration hides member dnl remark #11074: Inlining inhibited by limit max-size diff --git a/gdal_nopdf.patch b/gdal_nopdf.patch index 3ff6361..6a447ba 100644 --- a/gdal_nopdf.patch +++ b/gdal_nopdf.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/doc/source/index.rst gdal-3.4.1-fedora-new/doc/source/index.rst ---- gdal-3.4.1-fedora/doc/source/index.rst 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/doc/source/index.rst 2022-01-04 13:58:03.286553493 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/doc/source/index.rst gdal-3.4.2-fedora-new/doc/source/index.rst +--- gdal-3.4.2-fedora/doc/source/index.rst 2022-03-08 11:10:53.000000000 +0100 ++++ gdal-3.4.2-fedora-new/doc/source/index.rst 2022-03-14 23:50:44.609159787 +0100 @@ -4,8 +4,6 @@ GDAL .. include:: ./about_no_title.rst diff --git a/gdal_sphinx.patch b/gdal_sphinx.patch index c3ded15..224b9db 100644 --- a/gdal_sphinx.patch +++ b/gdal_sphinx.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/doc/Makefile gdal-3.4.1-fedora-new/doc/Makefile ---- gdal-3.4.1-fedora/doc/Makefile 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/doc/Makefile 2022-01-04 13:58:02.787551314 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/doc/Makefile gdal-3.4.2-fedora-new/doc/Makefile +--- gdal-3.4.2-fedora/doc/Makefile 2022-03-08 11:10:52.000000000 +0100 ++++ gdal-3.4.2-fedora-new/doc/Makefile 2022-03-14 23:50:44.164160839 +0100 @@ -2,7 +2,7 @@ # diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch index c8dfdaf..c792fb2 100644 --- a/gdal_tirpcinc.patch +++ b/gdal_tirpcinc.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.4.1-fedora/frmts/dods/GNUmakefile gdal-3.4.1-fedora-new/frmts/dods/GNUmakefile ---- gdal-3.4.1-fedora/frmts/dods/GNUmakefile 2021-12-27 21:25:11.000000000 +0100 -+++ gdal-3.4.1-fedora-new/frmts/dods/GNUmakefile 2022-01-04 13:58:02.255548990 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/frmts/dods/GNUmakefile gdal-3.4.2-fedora-new/frmts/dods/GNUmakefile +--- gdal-3.4.2-fedora/frmts/dods/GNUmakefile 2022-03-08 11:10:53.000000000 +0100 ++++ gdal-3.4.2-fedora-new/frmts/dods/GNUmakefile 2022-03-14 23:50:43.717161896 +0100 @@ -4,7 +4,7 @@ include ../../GDALmake.opt OBJ = dodsdataset2.o @@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.4.1-fedora/frmts/dods/GNUmakefile gdal-3.4.1- default: $(OBJ:.o=.$(OBJ_EXT)) -diff -rupN --no-dereference gdal-3.4.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile ---- gdal-3.4.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-12-27 21:25:12.000000000 +0100 -+++ gdal-3.4.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2022-01-04 13:58:02.256548994 +0100 +diff -rupN --no-dereference gdal-3.4.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile +--- gdal-3.4.2-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2022-03-08 11:10:53.000000000 +0100 ++++ gdal-3.4.2-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2022-03-14 23:50:43.717161896 +0100 @@ -5,7 +5,7 @@ include ../../../GDALmake.opt OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \ ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o diff --git a/sources b/sources index 80391a8..f34295e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.4.1-fedora.tar.xz) = d254d8e93fb6f43ba2db33949b4c69959237e1cc6e044b8f710a3802f28acc481a8ca7f877f0eea75ecb4138e80e8a79eceb67aebe0b86dfc2f71883874c541b -SHA512 (gdalautotest-3.4.1.tar.gz) = 6aa5cab257afdc345d3736a599150051621d775f19dabf6644b41fcd5f6cb2012948e9f9bf82033ae361d892faa4e1cdbb802f089af5ec94ae0552cd0338ae43 +SHA512 (gdal-3.4.2-fedora.tar.xz) = 68d94baa12c862fcec6a84e41d3c3a9574175cb408ab97d7c6e6a5dc011a298572259f7a90a9161ae87e3efffeda72118a3810cd985c2513d101b0460ba1d9d3 +SHA512 (gdalautotest-3.4.2.tar.gz) = a0d7d9aafda5e74fc32fcdba38bf6b9fa739fab41f9ee2fb1e0c43c44c6952f757116cc1140a5d45a2536189cf6436cac0e7e810bb85e9e0a7637cdfde33ea04