Skip to content

Commit

Permalink
update grass8 to 8.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Mar 8, 2024
1 parent 73b7c44 commit 5d2486c
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 24 deletions.
5 changes: 2 additions & 3 deletions src/grass8/osgeo4w/package.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export P=grass8
export V=8.3.1
export V=8.3.2
export B=next
export MAINTAINER=JuergenFischer
export BUILDDEPENDS="gdal-devel proj-devel geos-devel netcdf-devel libjpeg-turbo-devel libpq-devel libtiff-devel sqlite3-devel zstd-devel python3-ply python3-core python3-six python3-pywin32 python3-wxpython liblas-devel cairo-devel freetype-devel"
Expand All @@ -20,8 +20,7 @@ MM=${MM//./}
[ -f ../$p/configure ] || tar -C .. -xzf $p.tar.gz
[ -f ../$p/patched ] || {
patch -d ../$p -p1 --dry-run <patch
patch -d ../$p -p1 <patch
touch ../$p/patched
patch -d ../$p -p1 <patch >../$p/patched
}

export R=$OSGEO4W_REP/x86_64/release/$P
Expand Down
162 changes: 141 additions & 21 deletions src/grass8/osgeo4w/patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
diff -ur grass-8.3.0/include/Make/Grass.make ../grass-8.3.0/include/Make/Grass.make
--- grass-8.3.0/include/Make/Grass.make 2023-06-24 12:01:41.000000000 +0200
+++ ../grass-8.3.0/include/Make/Grass.make 2023-08-05 02:36:26.832721200 +0200
diff -Nur grass-8.3.2/include/Make/Compile.make ../grass-8.3.2/include/Make/Compile.make
--- grass-8.3.2/include/Make/Compile.make 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/include/Make/Compile.make 2024-03-08 13:40:10.196998500 +0100
@@ -47,14 +47,14 @@
%.manifest.res: %.manifest.rc %.exe.manifest
$(WINDRES) --input=$< --input-format=rc --output=$@ --output-format=coff -I$(MODULE_TOPDIR)/mswindows

-%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc
+%.manifest.rc: $(MODULE_TOPDIR)/mswindows/generic.manifest.rc.in
sed -e 's/@CMD@/$(notdir $*)/' \
-e 's/@VER_MAJOR@/$(GRASS_VERSION_MAJOR)/' \
-e 's/@VER_MINOR@/$(GRASS_VERSION_MINOR)/' \
-e 's/@VER_RELEASE@/$(GRASS_VERSION_RELEASE)/' \
- $(MODULE_TOPDIR)/mswindows/generic.manifest.rc > $@
+ $^ > $@

%.exe.manifest: $(MODULE_TOPDIR)/mswindows/generic.manifest
- sed 's/@CMD@/$(notdir $*)/' $(MODULE_TOPDIR)/mswindows/generic.manifest > $@
+ sed 's/@CMD@/$(notdir $*)/' $^ > $@

-include $(DEPFILE)
diff -Nur grass-8.3.2/include/Make/Grass.make ../grass-8.3.2/include/Make/Grass.make
--- grass-8.3.2/include/Make/Grass.make 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/include/Make/Grass.make 2024-03-08 13:40:10.206025700 +0100
@@ -196,7 +196,7 @@
FORMDEPS = $(DBMILIB) $(GISLIB)
RASTER3DDEPS = $(RASTERLIB) $(GISLIB)
Expand All @@ -10,9 +31,9 @@ diff -ur grass-8.3.0/include/Make/Grass.make ../grass-8.3.0/include/Make/Grass.m
GPDEDEPS = $(RASTER3DLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) $(MATHLIB)
GPROJDEPS = $(GISLIB) $(GDALLIBS) $(PROJLIB) $(MATHLIB)
HTMLDRIVERDEPS = $(DRIVERLIB) $(GISLIB) $(MATHLIB)
diff -ur grass-8.3.0/include/Make/Platform.make.in ../grass-8.3.0/include/Make/Platform.make.in
--- grass-8.3.0/include/Make/Platform.make.in 2023-06-24 12:01:41.000000000 +0200
+++ ../grass-8.3.0/include/Make/Platform.make.in 2023-08-05 02:36:26.833717900 +0200
diff -Nur grass-8.3.2/include/Make/Platform.make.in ../grass-8.3.2/include/Make/Platform.make.in
--- grass-8.3.2/include/Make/Platform.make.in 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/include/Make/Platform.make.in 2024-03-08 13:40:10.214828200 +0100
@@ -229,7 +229,7 @@
#OpenMP
OPENMP_INCPATH = @OPENMP_INCPATH@
Expand All @@ -22,9 +43,9 @@ diff -ur grass-8.3.0/include/Make/Platform.make.in ../grass-8.3.0/include/Make/P
OPENMP_CFLAGS = @OPENMP_CFLAGS@
USE_OPENMP = @USE_OPENMP@

diff -ur grass-8.3.0/lib/gis/gisinit.c ../grass-8.3.0/lib/gis/gisinit.c
--- grass-8.3.0/lib/gis/gisinit.c 2023-06-24 12:01:41.000000000 +0200
+++ ../grass-8.3.0/lib/gis/gisinit.c 2023-08-05 02:36:26.835734400 +0200
diff -Nur grass-8.3.2/lib/gis/gisinit.c ../grass-8.3.2/lib/gis/gisinit.c
--- grass-8.3.2/lib/gis/gisinit.c 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/lib/gis/gisinit.c 2024-03-08 13:40:10.223353400 +0100
@@ -49,6 +49,7 @@

G_set_program_name(pgm);
Expand Down Expand Up @@ -58,9 +79,107 @@ diff -ur grass-8.3.0/lib/gis/gisinit.c ../grass-8.3.0/lib/gis/gisinit.c
gisinit();
}

diff -ur grass-8.3.0/mswindows/osgeo4w/env.bat.tmpl ../grass-8.3.0/mswindows/osgeo4w/env.bat.tmpl
--- grass-8.3.0/mswindows/osgeo4w/env.bat.tmpl 2023-06-24 12:01:41.000000000 +0200
+++ ../grass-8.3.0/mswindows/osgeo4w/env.bat.tmpl 2023-08-05 02:36:26.837719300 +0200
diff -Nur grass-8.3.2/mswindows/generic.manifest.rc ../grass-8.3.2/mswindows/generic.manifest.rc
--- grass-8.3.2/mswindows/generic.manifest.rc 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/mswindows/generic.manifest.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#include "winver.h"
-#include "winuser.h"
-
-1 RT_MANIFEST "@[email protected]"
-
-1 ICON "grass.ico"
-
-#define VER_FILEVERSION @VER_MAJOR@,@VER_MINOR@,0,0
-#define VER_FILEVERSION_STR "@VER_MAJOR@.@VER_MINOR@.@VER_RELEASE@\0"
-
-#define VER_PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,0,0
-#define VER_PRODUCTVERSION_STR "@VER_MAJOR@.@VER_MINOR@.@VER_RELEASE@\0"
-
-#define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD
-#define VER_PRERELEASE VS_FF_PRERELEASE
-#define VER_DEBUG VS_FF_DEBUG
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION VER_FILEVERSION
-PRODUCTVERSION VER_PRODUCTVERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
-FILEOS VOS__WINDOWS32
-FILETYPE VFT_APP
-FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- BEGIN
- VALUE "CompanyName", "GRASS Development Team"
- VALUE "FileDescription", "GRASS @VER_MAJOR@"
- VALUE "FileVersion", VER_FILEVERSION_STR
- VALUE "LegalCopyright", "Copyright GRASS Development Team"
- VALUE "OriginalFilename", "@[email protected]"
- VALUE "ProductName", "GRASS @VER_MAJOR@"
- VALUE "ProductVersion", VER_PRODUCTVERSION_STR
- END
- END
-
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
diff -Nur grass-8.3.2/mswindows/generic.manifest.rc.in ../grass-8.3.2/mswindows/generic.manifest.rc.in
--- grass-8.3.2/mswindows/generic.manifest.rc.in 1970-01-01 01:00:00.000000000 +0100
+++ ../grass-8.3.2/mswindows/generic.manifest.rc.in 2024-03-08 13:40:04.813279500 +0100
@@ -0,0 +1,45 @@
+#include "winver.h"
+#include "winuser.h"
+
+1 RT_MANIFEST "@[email protected]"
+
+1 ICON "grass.ico"
+
+#define VER_FILEVERSION @VER_MAJOR@,@VER_MINOR@,0,0
+#define VER_FILEVERSION_STR "@VER_MAJOR@.@VER_MINOR@.@VER_RELEASE@\0"
+
+#define VER_PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,0,0
+#define VER_PRODUCTVERSION_STR "@VER_MAJOR@.@VER_MINOR@.@VER_RELEASE@\0"
+
+#define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD
+#define VER_PRERELEASE VS_FF_PRERELEASE
+#define VER_DEBUG VS_FF_DEBUG
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION VER_FILEVERSION
+PRODUCTVERSION VER_PRODUCTVERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "GRASS Development Team"
+ VALUE "FileDescription", "GRASS @VER_MAJOR@"
+ VALUE "FileVersion", VER_FILEVERSION_STR
+ VALUE "LegalCopyright", "Copyright GRASS Development Team"
+ VALUE "OriginalFilename", "@[email protected]"
+ VALUE "ProductName", "GRASS @VER_MAJOR@"
+ VALUE "ProductVersion", VER_PRODUCTVERSION_STR
+ END
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
diff -Nur grass-8.3.2/mswindows/osgeo4w/env.bat.tmpl ../grass-8.3.2/mswindows/osgeo4w/env.bat.tmpl
--- grass-8.3.2/mswindows/osgeo4w/env.bat.tmpl 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/mswindows/osgeo4w/env.bat.tmpl 2024-03-08 13:40:10.231835800 +0100
@@ -8,6 +8,7 @@
REM Note that msys package must be also installed
REM set GRASS_SH=%OSGEO4W_ROOT%\apps\msys\bin\sh.exe
Expand All @@ -69,13 +188,14 @@ diff -ur grass-8.3.0/mswindows/osgeo4w/env.bat.tmpl ../grass-8.3.0/mswindows/osg
set GRASS_PYTHON=%OSGEO4W_ROOT%\bin\python3.exe
set GRASS_PROJSHARE=%OSGEO4W_ROOT%\share\proj

diff -ur grass-8.3.0/mswindows/osgeo4w/package.sh ../grass-8.3.0/mswindows/osgeo4w/package.sh
--- grass-8.3.0/mswindows/osgeo4w/package.sh 2023-06-24 12:01:41.000000000 +0200
+++ ../grass-8.3.0/mswindows/osgeo4w/package.sh 2023-08-08 23:28:51.793576200 +0200
@@ -111,29 +111,21 @@
diff -Nur grass-8.3.2/mswindows/osgeo4w/package.sh ../grass-8.3.2/mswindows/osgeo4w/package.sh
--- grass-8.3.2/mswindows/osgeo4w/package.sh 2024-03-06 22:24:05.000000000 +0100
+++ ../grass-8.3.2/mswindows/osgeo4w/package.sh 2024-03-08 13:40:10.245891600 +0100
@@ -110,30 +110,21 @@
/mingw64/bin/zlib1.dll
/mingw64/bin/libbz2-1.dll
/mingw64/bin/libiconv-2.dll
/mingw64/bin/libexpat-1.dll
- /mingw64/bin/libexpat-1.dll
- /mingw64/bin/libfontconfig-1.dll
/mingw64/bin/libgfortran-5.dll
- /mingw64/bin/libbrotlidec.dll
Expand Down Expand Up @@ -104,7 +224,7 @@ diff -ur grass-8.3.0/mswindows/osgeo4w/package.sh ../grass-8.3.0/mswindows/osgeo
"

if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
@@ -149,18 +141,18 @@
@@ -149,18 +140,18 @@
cp -uv $DLLS dist.x86_64-w64-mingw32/bin

mkdir -p mswindows/osgeo4w/lib
Expand All @@ -130,7 +250,7 @@ diff -ur grass-8.3.0/mswindows/osgeo4w/package.sh ../grass-8.3.0/mswindows/osgeo
--with-opengl=windows \
--without-x \
--with-cxx \
@@ -168,13 +160,13 @@
@@ -168,13 +159,13 @@
--enable-largefile \
--with-fftw \
--with-freetype \
Expand All @@ -150,7 +270,7 @@ diff -ur grass-8.3.0/mswindows/osgeo4w/package.sh ../grass-8.3.0/mswindows/osgeo
--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
--with-geos=$PWD/mswindows/osgeo4w/geos-config \
--with-sqlite \
@@ -190,10 +182,11 @@
@@ -190,10 +181,11 @@
--with-lapack-includes=/mingw64/include \
--with-openmp \
--with-cairo \
Expand All @@ -164,7 +284,7 @@ diff -ur grass-8.3.0/mswindows/osgeo4w/package.sh ../grass-8.3.0/mswindows/osgeo
--without-pdal

touch mswindows/osgeo4w/configure-stamp
@@ -249,7 +242,9 @@
@@ -249,7 +241,9 @@

# copy dependencies (TODO: to be reduced)
cp -uv $DLLS apps/grass/grass$POSTFIX/bin
Expand Down

0 comments on commit 5d2486c

Please sign in to comment.