move workarounds from CompileOnWindows into actual bugfixes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37643 15284696-431f-4ddb-bdfa-cd5b030d7da7

mswindows/osgeo4w/package.sh

@@ -31,7 +31,9 @@ if ! [ -f configure-stamp ]; then
 		--with-regex \
 		--with-nls \
 		--without-swig \
-		--with-freetype-includes=/c/OSGeo4W/include/freetype2
+		--with-freetype-includes=/c/OSGeo4W/include/freetype2 \
+		--without-cairo \
+		--without-geos
 
 	echo $(date): STARTING make clean
 	make clean