Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grass for openSUSE:Factory checked in at 2021-06-18 10:13:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grass (Old) and /work/SRC/openSUSE:Factory/.grass.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grass" Fri Jun 18 10:13:46 2021 rev:8 rq:900444 version:7.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/grass/grass.changes 2021-05-10 15:41:19.897097597 +0200 +++ /work/SRC/openSUSE:Factory/.grass.new.2625/grass.changes 2021-06-18 10:14:00.274011558 +0200 @@ -1,0 +2,6 @@ +Wed Jun 16 16:26:04 UTC 2021 - Bruno Friedmann <br...@ioda-net.ch> + +- Add upstream patch b86314c7.patch to fix build failure due + to gdal 3.3.0. This close boo#1187371 and upstream issue#1649 + +------------------------------------------------------------------- New: ---- b86314c7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grass.spec ++++++ --- /var/tmp/diff_new_pack.0hcEoY/_old 2021-06-18 10:14:00.954012457 +0200 +++ /var/tmp/diff_new_pack.0hcEoY/_new 2021-06-18 10:14:00.958012463 +0200 @@ -42,6 +42,8 @@ URL: https://grass.osgeo.org/ Source: https://grass.osgeo.org/grass%{shortver}/source/%{name}-%{version}.tar.gz Source1: https://grass.osgeo.org/grass%{shortver}/source/%{name}-%{version}.md5sum +# UPSTREAM-PATCH fix compilation with GDAL 3.3.0 +Patch0: https://github.com/OSGeo/grass/commit/b86314c7.patch BuildRequires: -post-build-checks BuildRequires: bison BuildRequires: blas-devel @@ -121,6 +123,7 @@ %prep %setup -q -n grass-%{version} +%patch0 -p1 %define grasver -@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@ %define grasver2 '-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}' ++++++ b86314c7.patch ++++++ >From b86314c7f3b8aea961d380dbb836087b3990d7af Mon Sep 17 00:00:00 2001 From: nilason <n_lars...@yahoo.com> Date: Thu, 6 May 2021 22:27:48 +0200 Subject: [PATCH] v.hull: use standard C boolean type Fixes #1563 --- vector/v.hull/chull.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c index 1ad97396fa..41b627c50f 100644 --- a/vector/v.hull/chull.c +++ b/vector/v.hull/chull.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> +#include <stdbool.h> #include <grass/gis.h> #include <grass/vector.h> @@ -29,10 +30,6 @@ #include "globals.h" -/*Define Boolean type */ -typedef enum -{ BFALSE, BTRUE } bool; - /* Define vertex indices. */ #define X 0 #define Y 1 @@ -76,10 +73,10 @@ struct tFaceStructure }; /* Define flags */ -#define ONHULL BTRUE -#define REMOVED BTRUE -#define VISIBLE BTRUE -#define PROCESSED BTRUE +#define ONHULL true +#define REMOVED true +#define VISIBLE true +#define PROCESSED true /* Global variable definitions */ tVertex vertices = NULL; @@ -436,7 +433,7 @@ bool AddOne(tVertex p) tFace f; tEdge e, temp; long int vol; - bool vis = BFALSE; + bool vis = false; /* Mark faces visible from p. */ @@ -446,7 +443,7 @@ bool AddOne(tVertex p) if (vol < 0) { f->visible = VISIBLE; - vis = BTRUE; + vis = true; } f = f->next; } while (f != faces); @@ -454,7 +451,7 @@ bool AddOne(tVertex p) /* If no faces are visible from p, then p is inside the hull. */ if (!vis) { p->onhull = !ONHULL; - return BFALSE; + return false; } /* Mark edges in interior of visible region for deletion. @@ -470,7 +467,7 @@ bool AddOne(tVertex p) e->newface = MakeConeFace(e, p); e = temp; } while (e != edges); - return BTRUE; + return true; } /*---------------------------------------------------------------------
