rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 3.4.1

This commit is contained in:
Sandro Mani 2022-01-04 16:38:20 +01:00
parent 6aeff86eb7
commit fd018d2f1a
12 changed files with 66 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -69,3 +69,5 @@ gdalautotest-1.7.0.tar.gz
/gdalautotest-3.3.3.tar.gz
/gdal-3.4.0-fedora.tar.xz
/gdalautotest-3.4.0.tar.gz
/gdal-3.4.1-fedora.tar.xz
/gdalautotest-3.4.1.tar.gz

18
gdal-gcc11.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
--- gdal-3.4.0-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-11-04 12:56:51.000000000 +0100
+++ gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-11-09 11:58:38.117291664 +0100
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
@@ -34,6 +34,7 @@
#include <limits>
#include <math.h>
@ -9,9 +9,9 @@ diff -rupN --no-dereference gdal-3.4.0-fedora/ogr/ogrsf_frmts/cad/libopencad/cad
//------------------------------------------------------------------------------
// CADVector
diff -rupN --no-dereference gdal-3.4.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.4.0-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-11-04 12:56:50.000000000 +0100
+++ gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-11-09 11:58:38.117291664 +0100
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
@@ -39,6 +39,7 @@
#include <limits>
#include <memory>
@ -20,9 +20,9 @@ diff -rupN --no-dereference gdal-3.4.0-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.0-fedora/third_party/LercLib/Lerc2.h gdal-3.4.0-fedora-new/third_party/LercLib/Lerc2.h
--- gdal-3.4.0-fedora/third_party/LercLib/Lerc2.h 2021-11-04 12:56:01.000000000 +0100
+++ gdal-3.4.0-fedora-new/third_party/LercLib/Lerc2.h 2021-11-09 11:58:38.118291684 +0100
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
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
#include <limits>
#include <string>

9
gdal.spec
View File

@ -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.0
%global testversion 3.4.1
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@ -43,8 +43,8 @@
%endif
Name: gdal
Version: 3.4.0
Release: 2%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
Version: 3.4.1
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
* Tue Jan 04 2022 Sandro Mani <manisandro@gmail.com> - 3.4.1-1
- Update to 3.4.1
* Sun Nov 21 2021 Orion Poplawski <orion@nwra.com> - 3.4.0-2
- Rebuild for hdf5 1.12.1

6
gdal_autoconf270.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/m4/lib-link.m4 gdal-3.4.0-fedora-new/m4/lib-link.m4
--- gdal-3.4.0-fedora/m4/lib-link.m4 2021-11-04 12:57:06.000000000 +0100
+++ gdal-3.4.0-fedora-new/m4/lib-link.m4 2021-11-09 11:58:38.585300818 +0100
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
@@ -108,8 +108,6 @@ dnl acl_hardcode_direct,
dnl acl_hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],

6
gdal_installapps.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/apps/GNUmakefile gdal-3.4.0-fedora-new/apps/GNUmakefile
--- gdal-3.4.0-fedora/apps/GNUmakefile 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/apps/GNUmakefile 2021-11-09 11:58:37.658282683 +0100
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
@@ -232,6 +232,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default

6
gdal_iso8211.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/frmts/iso8211/GNUmakefile gdal-3.4.0-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.4.0-fedora/frmts/iso8211/GNUmakefile 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/frmts/iso8211/GNUmakefile 2021-11-09 11:58:37.203273779 +0100
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
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)

60
gdal_java.patch
View File

@ -1,13 +1,11 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/add_javadoc.c gdal-3.4.0-fedora-new/swig/java/add_javadoc.c
--- gdal-3.4.0-fedora/swig/java/add_javadoc.c 2021-11-04 12:55:39.000000000 +0100
+++ gdal-3.4.0-fedora-new/swig/java/add_javadoc.c 2021-11-09 11:58:36.600261974 +0100
@@ -133,22 +133,22 @@ int main(int argc, char* argv[])
FILE* fDst;
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
@@ -142,21 +142,21 @@ int main(int argc, char* argv[])
JavaDocInstance* instances = (JavaDocInstance*)calloc(sizeof(JavaDocInstance), 3000);
int nInstances = 0;
- char szLine[256];
char szLine[512];
- char szClass[256];
+ char szLine[512];
+ char szClass[512];
char javadoc[16384];
szClass[0] = 0;
@ -29,9 +27,9 @@ diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/add_javadoc.c gdal-3.4.0
{
if (szLine[0] == 10)
continue;
@@ -188,10 +188,10 @@ begin:
fDst = fopen(szDstName, "wt");
if (fDst == NULL) continue;
@@ -209,10 +209,10 @@ begin:
continue;
}
szClass[0] = 0;
- char szPackage[256];
+ char szPackage[512];
@ -42,48 +40,36 @@ diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/add_javadoc.c gdal-3.4.0
{
char szMethodName[1024];
char* szOriLine = strdup(szLine);
@@ -224,8 +224,10 @@ begin:
if (strstr(szLine, "synchronized "))
{
char* c = strstr(szLine, "synchronized ");
+ char rest[512];
+ strcpy(rest, c + 13);
*c = 0;
- strcat(szLine, c + 13);
+ strcat(szLine, rest);
}
if (strstr(szLine, "public") && !strstr(szLine, "native"))
{
@@ -234,7 +236,7 @@ begin:
@@ -255,7 +255,7 @@ begin:
strcpy(szMethodName, szLine);
do
{
- fgets(szLine, 255, fSrc);
+ fgets(szLine, 511, fSrc);
- ignore_ret(fgets(szLine, 255, fSrc));
+ ignore_ret(fgets(szLine, 511, fSrc));
strcpy(szMethodName + strlen(szMethodName) - 1, szLine);
} while (!strchr(szMethodName,')'));
strcpy(szLine, szMethodName);
@@ -261,7 +263,7 @@ begin:
@@ -282,7 +282,7 @@ begin:
{
do
{
- fgets(szLine, 255, fSrc);
+ fgets(szLine, 511, fSrc);
- ignore_ret(fgets(szLine, 255, fSrc));
+ ignore_ret(fgets(szLine, 511, fSrc));
} while (!strchr(szLine,'}'));
}
break;
@@ -289,7 +291,7 @@ begin:
@@ -310,7 +310,7 @@ begin:
nBrackets --;
}
}
- fgets(szLine, 255, fSrc);
+ fgets(szLine, 511, fSrc);
- ignore_ret(fgets(szLine, 255, fSrc));
+ ignore_ret(fgets(szLine, 511, fSrc));
} while(bFoundOpen == FALSE || nBrackets > 0);
}
else
diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/javadoc.java gdal-3.4.0-fedora-new/swig/java/javadoc.java
--- gdal-3.4.0-fedora/swig/java/javadoc.java 2021-11-04 12:55:40.000000000 +0100
+++ gdal-3.4.0-fedora-new/swig/java/javadoc.java 2021-11-09 11:58:36.602262013 +0100
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
@@ -11982,12 +11982,12 @@ public interface osrConstants:public fin
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM
@ -99,9 +85,9 @@ diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/javadoc.java gdal-3.4.0-
* or iterative convergence method failed.
*/
public interface osrConstants:public final static int PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN
diff -rupN --no-dereference gdal-3.4.0-fedora/swig/java/java.opt gdal-3.4.0-fedora-new/swig/java/java.opt
--- gdal-3.4.0-fedora/swig/java/java.opt 2021-11-04 12:55:38.000000000 +0100
+++ gdal-3.4.0-fedora-new/swig/java/java.opt 2021-11-09 11:58:36.602262013 +0100
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
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java

6
gdal_no-diag-disable.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/configure.ac gdal-3.4.0-fedora-new/configure.ac
--- gdal-3.4.0-fedora/configure.ac 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/configure.ac 2021-11-09 11:58:38.356296339 +0100
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
@@ -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

6
gdal_nopdf.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/doc/source/index.rst gdal-3.4.0-fedora-new/doc/source/index.rst
--- gdal-3.4.0-fedora/doc/source/index.rst 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/doc/source/index.rst 2021-11-09 11:58:37.885287126 +0100
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
@@ -4,8 +4,6 @@ GDAL
.. include:: ./about_no_title.rst

6
gdal_sphinx.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/doc/Makefile gdal-3.4.0-fedora-new/doc/Makefile
--- gdal-3.4.0-fedora/doc/Makefile 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/doc/Makefile 2021-11-09 11:58:37.435278319 +0100
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
@@ -2,7 +2,7 @@
#

12
gdal_tirpcinc.patch
View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.4.0-fedora/frmts/dods/GNUmakefile gdal-3.4.0-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.4.0-fedora/frmts/dods/GNUmakefile 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/frmts/dods/GNUmakefile 2021-11-09 11:58:36.942268671 +0100
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
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
@ -10,9 +10,9 @@ diff -rupN --no-dereference gdal-3.4.0-fedora/frmts/dods/GNUmakefile gdal-3.4.0-
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.4.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.4.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2021-11-04 12:55:37.000000000 +0100
+++ gdal-3.4.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-11-09 11:58:36.942268671 +0100
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
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.4.0-fedora.tar.xz) = b649dc43bbad297482a29e7202a32f57b75f0e9f9aa6e156b9759986660d8f27d5b5e73b6367e088108ceead9b558d552d3560ca7dac7a7b0c944c6509e5e956
SHA512 (gdalautotest-3.4.0.tar.gz) = b9258b93e2db9cdc2aa0d290272314e4bfad177a51a7f60d40a8bbebbe9f5e31f9e7a7f0f25a3d600357a3db9c02cca0e426970e0057c59d176fedcdc32ef089
SHA512 (gdal-3.4.1-fedora.tar.xz) = d254d8e93fb6f43ba2db33949b4c69959237e1cc6e044b8f710a3802f28acc481a8ca7f877f0eea75ecb4138e80e8a79eceb67aebe0b86dfc2f71883874c541b
SHA512 (gdalautotest-3.4.1.tar.gz) = 6aa5cab257afdc345d3736a599150051621d775f19dabf6644b41fcd5f6cb2012948e9f9bf82033ae361d892faa4e1cdbb802f089af5ec94ae0552cd0338ae43