[GRASS-SVN] r67642 - in grass/branches/releasebranch_7_0/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-01-23 09:53:34 -0800 (Sat, 23 Jan 2016)
New Revision: 67642

Modified:
   grass/branches/releasebranch_7_0/mswindows/env.bat
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
fix d.fontlist crashes on Windows (#2870)
    (merge r67630 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/env.bat	2016-01-23 16:56:37 UTC (rev 67641)
+++ grass/branches/releasebranch_7_0/mswindows/env.bat	2016-01-23 17:53:34 UTC (rev 67642)
@@ -11,6 +11,8 @@
 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

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2016-01-23 16:56:37 UTC (rev 67641)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/env.bat.tmpl	2016-01-23 17:53:34 UTC (rev 67642)
@@ -13,6 +13,8 @@
 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

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2016-01-23 16:56:37 UTC (rev 67641)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2016-01-23 17:53:34 UTC (rev 67642)
@@ -255,6 +255,8 @@
 	/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 \