<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c20b559a26d9f753e9209e9a1b2493b115c9b8a9">https://github.com/macports/macports-ports/commit/c20b559a26d9f753e9209e9a1b2493b115c9b8a9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c20b559a26d grass7: update to version 7.8.8
</span>c20b559a26d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c20b559a26d9f753e9209e9a1b2493b115c9b8a9
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Mon Aug 7 12:38:02 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: update to version 7.8.8
</span>---
gis/grass7/Portfile | 11 ++--
gis/grass7/files/patch_implicit_int.diff | 89 --------------------------------
2 files changed, 5 insertions(+), 95 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22fd426cdb6..7ebd73f786b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,10 @@ PortGroup wxWidgets 1.0
</span> PortGroup github 1.0
PortGroup debug 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo grass 7.8.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 7.8.8
</span> name grass7
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description GRASS is a Geographic Information System (GIS) used for \
</span> homepage https://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ae1e1b2b775cc8e4a513bc42fbe40ed1ea8326d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4fff7be556d820ed81704bb27fe3ed913c173076bb3ed036bcc3a49bd4027f69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 66333084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a0fcde7ad2192e1d0dbaf3c827b208751786af9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ba9620a87a89ad924670ce193a8de00329f57e7389539596698849e5ee5deebe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66331485
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ depends_lib port:bzip2 \
</span> port:readline
patchfiles-append patch-grass.py.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch_implicit_int.diff
</span>
configure.cflags -DGL_SILENCE_DEPRECATION
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/files/patch_implicit_int.diff b/gis/grass7/files/patch_implicit_int.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d2e26c0249b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/files/patch_implicit_int.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Addressed upstreams with https://github.com/OSGeo/grass/pull/3097.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.sun/local_proto.h.orig 2023-07-24 11:18:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.sun/local_proto.h 2023-07-24 13:24:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void setAngularLossDenominator();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void cube(int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* void cube(int, int); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double com_sol_const(int no_of_day);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.sun/main.c.orig 2023-07-24 11:18:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.sun/main.c 2023-07-24 13:26:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,8 +118,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int min(int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int max(int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void cube(int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void (*func) (int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* void cube(int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void (*func) (int, int); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void joules2(struct SunGeometryConstDay *sunGeom,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct SunGeometryVarDay *sunVarGeom,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1685,9 +1685,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void cube(jmin, imin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* void cube(jmin, imin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+} */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*////////////////////////////////////////////////////////////////////// */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1837,7 +1837,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sunVarGeom.zmax = zmax;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shadowoffset_base = (j % (numRows)) * n * arrayNumInt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #pragma omp parallel firstprivate(q1,tan_lam_l,z1,i,shadowoffset,longitTime,coslat,coslatsq,func,latitude,longitude,sin_phi_l,latid_l,sin_u,cos_u,sin_v,cos_v,lum,gridGeom,elevin,aspin,slopein,civiltime,linkein,albedo,latin,coefbh,coefdh,incidout,longin,horizon,beam_rad,insol_time,diff_rad,refl_rad,glob_rad,mapset,per,decimals,str_step)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #pragma omp parallel firstprivate(q1,tan_lam_l,z1,i,shadowoffset,longitTime,coslat,coslatsq,latitude,longitude,sin_phi_l,latid_l,sin_u,cos_u,sin_v,cos_v,lum,gridGeom,elevin,aspin,slopein,civiltime,linkein,albedo,latin,coefbh,coefdh,incidout,longin,horizon,beam_rad,insol_time,diff_rad,refl_rad,glob_rad,mapset,per,decimals,str_step)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma omp for schedule(dynamic) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- firstprivate(sunGeom,sunVarGeom,sunSlopeGeom,sunRadVar) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1862,7 +1862,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coslatsq = coslat * coslat;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* func = NULL; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sunVarGeom.z_orig = z1 = sunVarGeom.zp = z[arrayOffset][i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.sun/rsunglobals.h.orig 2023-07-24 11:18:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.sun/rsunglobals.h 2023-07-24 13:26:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,4 +60,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern struct pj_info oproj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void (*func) (int, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* extern void (*func) (int, int); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- raster/r.sun/rsunlib.c.orig 2023-07-24 11:18:39.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ raster/r.sun/rsunlib.c 2023-07-24 13:27:38.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,11 +300,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (succes == 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- where_is_point(length, sunVarGeom, gridGeom);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (func == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*if (func == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gridGeom->xx0 = gridGeom->xg0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gridGeom->yy0 = gridGeom->yg0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curvature_diff = EARTHRADIUS * (1. - cos(*length / EARTHRADIUS));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- z2 = sunVarGeom->z_orig + curvature_diff +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,7 +338,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double timeoffset, horizPos;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double horizonHeight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- func = cube;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* func = cube; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sunVarGeom->isShadow = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (useShadow()) {
</span></pre><pre style='margin:0'>
</pre>