Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2019-11-07 23:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Thu Nov 7 23:19:22 2019 rev:45 rq:746088 version:3.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2019-10-11 15:16:56.384165846 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.2990/gdal.changes 2019-11-07 23:19:38.996737402 +0100 @@ -1,0 +2,9 @@ +Wed Nov 6 12:58:46 UTC 2019 - Libor Pechacek <lpecha...@gmx.com> + +- update to 3.0.2 + Full changelogs: + https://trac.osgeo.org/gdal/wiki/Release/3.0.2-News +- Refreshed patches: + 0001-Replace-SWIG-Python-obj0-swig_obj-0-with-version-agn.patch + +------------------------------------------------------------------- Old: ---- gdal-3.0.1.tar.xz gdal-3.0.1.tar.xz.md5 New: ---- gdal-3.0.2.tar.xz gdal-3.0.2.tar.xz.md5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.Od88lD/_old 2019-11-07 23:19:40.284738784 +0100 +++ /var/tmp/diff_new_pack.Od88lD/_new 2019-11-07 23:19:40.288738788 +0100 @@ -26,7 +26,7 @@ %bcond_with ecw5_support %bcond_with fgdb_support Name: gdal -Version: 3.0.1 +Version: 3.0.2 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT AND BSD-3-Clause AND SUSE-Public-Domain ++++++ 0001-Replace-SWIG-Python-obj0-swig_obj-0-with-version-agn.patch ++++++ --- /var/tmp/diff_new_pack.Od88lD/_old 2019-11-07 23:19:40.316738818 +0100 +++ /var/tmp/diff_new_pack.Od88lD/_new 2019-11-07 23:19:40.316738818 +0100 @@ -1,6 +1,7 @@ -From 10289fbed9db3f803571607e09ce93ee5e183e3d Mon Sep 17 00:00:00 2001 +From 8f52960e1c6f2fde21fbc3cfe8064af84f90a09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> -Date: Thu, 5 Sep 2019 20:54:32 +0200 +Date: Thu, 5 Sep 2019 20:05:53 +0200 +Git-id: 8328ae3077aea7e54537d76a9a8193775ddc8b09 Subject: [PATCH] Replace SWIG Python obj0/swig_obj[0] with version agnostic $self @@ -8,39 +9,54 @@ with swig 3.0, see swig/swig@cd8fc0a. Use the correct "$self" notation, which is expanded to the correct code regardless of swig version and options. + +Acked-by: Libor Pechacek <lpecha...@gmx.com> --- - gdal/swig/include/gdal_array.i | 6 +++--- - gdal/swig/include/python/typemaps_python.i | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) + swig/include/gdal_array.i | 12 +++--------- + swig/include/python/typemaps_python.i | 8 +------- + 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i -index ff7bcde6c7..5dd3679cb2 100644 +index d86491d1d45e..6ee34b9abd99 100644 --- a/swig/include/gdal_array.i +++ b/swig/include/gdal_array.i -@@ -878,11 +878,11 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray) +@@ -913,18 +913,12 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray) + } /* Keep a reference to the VirtualMem object */ +-%#if SWIGVERSION >= 0x040000 +-%#define obj0 swig_obj[0] +-%#endif %#if NPY_API_VERSION >= 0x00000007 - PyArray_SetBaseObject(ar, obj0); + PyArray_SetBaseObject(ar, $self); %#else - PyArray_BASE(ar) = obj0; +-%#endif +- Py_INCREF(obj0); +-%#if SWIGVERSION >= 0x040000 +-%#undef obj0 + PyArray_BASE(ar) = $self; %#endif -- Py_INCREF(obj0); + Py_INCREF($self); Py_DECREF($result); $result = (PyObject*) ar; } diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i -index 104b214ac1..9517c72ebd 100644 +index 85a25b5a3099..2af8b51c6368 100644 --- a/swig/include/python/typemaps_python.i +++ b/swig/include/python/typemaps_python.i -@@ -1911,7 +1911,7 @@ DecomposeSequenceOfCoordinates( PyObject *seq, int nCount, double *x, double *y, - %#if PY_VERSION_HEX >= 0x02070000 +@@ -2067,13 +2067,7 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double * /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/ Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer)); -- if (PyBuffer_FillInfo(buf, obj0, *($1), *($2), *($4), PyBUF_ND)) { + +- if (PyBuffer_FillInfo(buf, +-%#if SWIGVERSION >= 0x040000 +- swig_obj[0], +-%#else +- obj0, +-%#endif +- *($1), *($2), *($4), PyBUF_ND)) { + if (PyBuffer_FillInfo(buf, $self, *($1), *($2), *($4), PyBUF_ND)) { // error, handle } ++++++ gdal-3.0.1.tar.xz -> gdal-3.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/gdal/gdal-3.0.1.tar.xz /work/SRC/openSUSE:Factory/.gdal.new.2990/gdal-3.0.2.tar.xz differ: char 25, line 1 ++++++ gdal-3.0.1.tar.xz.md5 -> gdal-3.0.2.tar.xz.md5 ++++++ --- /work/SRC/openSUSE:Factory/gdal/gdal-3.0.1.tar.xz.md5 2019-07-23 22:34:40.763004794 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.2990/gdal-3.0.2.tar.xz.md5 2019-11-07 23:19:38.968737372 +0100 @@ -1 +1 @@ -f3bcf494f8285861dedaa5b9aa6e9479 gdal-3.0.1.tar.xz +0353d7e56efc79fcaaeb21d808cb9cac gdal-3.0.2.tar.xz
