[Git][debian-gis-team/postgis][master] Add upstream patch to fix FTBFS with GCC 10. (closes: #957699)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / postgis


Commits:
f3969a5d by Bas Couwenberg at 2020-04-17T20:25:35+02:00
Add upstream patch to fix FTBFS with GCC 10. (closes: #957699)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-Fix-compilation-errors-with-gcc-10.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+postgis (3.0.1+dfsg-3) UNRELEASED; urgency=medium
+
+  * Add upstream patch to fix FTBFS with GCC 10.
+    (closes: #957699)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Apr 2020 20:25:01 +0200
+
 postgis (3.0.1+dfsg-2) unstable; urgency=medium
 
   * Add upstream patch to fix FTBFS with PROJ 7.


=====================================
debian/patches/0001-Fix-compilation-errors-with-gcc-10.patch
=====================================
@@ -0,0 +1,44 @@
+Description: Fix compilation errors with gcc 10
+Author: Raúl Marín <git at rmr.ninja>
+Origin: https://trac.osgeo.org/postgis/changeset/72fc4cd802b0b4a69c2e0e6a0ac37f01315ef83c/git
+Bug: https://trac.osgeo.org/postgis/ticket/4667
+Bug-Debian: https://bugs.debian.org/957699
+
+--- a/raster/test/cunit/cu_tester.c
++++ b/raster/test/cunit/cu_tester.c
+@@ -14,6 +14,8 @@
+ #include "CUnit/Basic.h"
+ #include "cu_tester.h"
+ 
++char cu_error_msg[MAX_CUNIT_MSG_LENGTH + 1] = {0};
++
+ /* Internal funcs */
+ static void
+ cu_error_reporter(const char *fmt, va_list ap);
+--- a/raster/test/cunit/cu_tester.h
++++ b/raster/test/cunit/cu_tester.h
+@@ -8,6 +8,9 @@
+  *
+  **********************************************************************/
+ 
++#ifndef _CU_RASTER_TESTER_H
++#define _CU_RASTER_TESTER_H 1
++
+ #include "librtcore.h"
+ 
+ #include "../../../postgis_config.h"
+@@ -18,7 +21,7 @@
+ #define PG_ADD_TEST(suite, testfunc) CU_add_test(suite, #testfunc, testfunc)
+ 
+ /* Contains the most recent error message generated by rterror. */
+-char cu_error_msg[MAX_CUNIT_MSG_LENGTH+1];
++extern char cu_error_msg[];
+ 
+ /* Resets cu_error_msg back to blank. */
+ void cu_error_msg_reset(void);
+@@ -35,3 +38,5 @@ rt_band cu_add_band(
+ 
+ /* Our internal callback to register Suites with the main tester */
+ typedef void (*PG_SuiteSetup)(void);
++
++#endif /* _CU_RASTER_TESTER_H */


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 relax-test-timing-constraints.patch
 chaikin
 0001-regress_proj-Avoid-testing-with-points-out-of-the-sr.patch
+0001-Fix-compilation-errors-with-gcc-10.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/f3969a5d52962be031fec6b66d3c162aac7d615d

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/f3969a5d52962be031fec6b66d3c162aac7d615d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200417/3526200a/attachment-0001.html>