Browse Source

attempt to fix d.fontlist crashes on Windows (https://trac.osgeo.org/grass/ticket/2870)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67630 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 years ago
parent
commit
6123119d63
3 changed files with 6 additions and 0 deletions
  1. 2 0
      mswindows/env.bat
  2. 2 0
      mswindows/osgeo4w/env.bat.tmpl
  3. 2 0
      mswindows/osgeo4w/package.sh

+ 2 - 0
mswindows/env.bat

@@ -11,6 +11,8 @@ set PROJ_LIB=%GISBASE%\share\proj
 set GDAL_DATA=%GISBASE%\share\gdal
 set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
 
+set FONTCONFIG_FILE=%GISBASE%\etc\fonts.conf
+
 set PATH=%GISBASE%\extrabin;%GISBASE%\bin;%PATH%
 
 REM set RStudio temporarily to %PATH% if it exists

+ 2 - 0
mswindows/osgeo4w/env.bat.tmpl

@@ -13,6 +13,8 @@ set PROJ_LIB=%OSGEO4W_ROOT%\share\proj
 set GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
 set GEOTIFF_CSV=%OSGEO4W_ROOT%\share\epsg_csv
 
+set FONTCONFIG_FILE=%GISBASE%\etc\fonts.conf
+
 REM set RStudio temporarily to %PATH% if it exists
 
 IF EXIST "%ProgramFiles%\RStudio\bin\rstudio.exe" set PATH=%PATH%;%ProgramFiles%\RStudio\bin

+ 2 - 0
mswindows/osgeo4w/package.sh

@@ -255,6 +255,8 @@ if [ -n "$PACKAGE_PATCH" ]; then
 	/mingw${MINGW_POSTFIX}/bin/libtre-5.dll \
         /mingw${MINGW_POSTFIX}/bin/zlib1.dll \
 	apps/grass/grass-$VERSION/bin
+    cp -uv /mingw${MINGW_POSTFIX}/etc/fonts/fonts.conf \
+	apps/grass/grass-$VERSION/etc
     
     # creating grass package
     tar -cjf $PDIR/grass$PACKAGE_POSTFIX-$VERSION-$PACKAGE_PATCH.tar.bz2 \