diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index e645585dcc1..4db5f0da9e7 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -39,7 +39,7 @@ jobs: $exe = 'osgeo4w-setup.exe' $url = 'http://download.osgeo.org/osgeo4w/v2/' + $exe (New-Object System.Net.WebClient).DownloadFile($url, $exe) - Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q -s http://download.osgeo.org/osgeo4w/v2/ -P proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,python3-six,python3-wxpython,regex-devel,wxwidgets-devel,zstd-devel' -Wait + Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q -s http://download.osgeo.org/osgeo4w/v2/ -P proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,python3-six,python3-wxpython,regex-devel,zstd-devel' -Wait - name: Compile GRASS GIS run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location) diff --git a/.travis/linux.install.sh b/.travis/linux.install.sh index 640228043b9..ffdbebcb106 100755 --- a/.travis/linux.install.sh +++ b/.travis/linux.install.sh @@ -26,7 +26,6 @@ sudo apt-get install --no-install-recommends \ libreadline-dev \ libsqlite3-dev \ libtiff-dev \ - libwxgtk3.0-gtk3-dev \ libxmu-dev \ libzstd-dev \ python3 \ diff --git a/.travis/linux.script.sh b/.travis/linux.script.sh index 162b5470083..416a072d0f1 100755 --- a/.travis/linux.script.sh +++ b/.travis/linux.script.sh @@ -27,7 +27,6 @@ export CC="ccache $CC" --with-freetype-includes=/usr/include/freetype2/ \ --with-postgres-includes=/usr/include/postgresql/ \ --with-proj-share=/usr/share/proj \ - --with-wxwidgets=/usr/bin/wx-config \ --with-python \ --with-cairo diff --git a/Vagrantfile b/Vagrantfile index 0a47b641568..16499ba3f8b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -63,7 +63,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| "proj-bin", "libreadline-dev", "libsqlite3-dev", - "libwxgtk3.0-gtk3-dev", "libxmu-dev", "python3", "python3-wxgtk4.0", diff --git a/configure b/configure index 128ce44d522..09803275373 100755 --- a/configure +++ b/configure @@ -888,7 +888,6 @@ with_zstd with_gdal with_liblas with_pdal -with_wxwidgets with_netcdf with_geos with_includes @@ -1620,10 +1619,6 @@ Optional Packages: enable PDAL support (pdal-config with path, e.g. '--with-pdal=/usr/local/bin/pdal-config', default: no) - --with-wxwidgets=path/wx-config - enable wxWidgets support (wx-config with path, - e.g. '--with-wxwidgets=/usr/local/bin/wx-config', - default: no) --with-netcdf=path/nc-config enable NetCDF support (nc-config with path, e.g. '--with-nc=/usr/local/bin/nc-config', @@ -4458,15 +4453,6 @@ fi -# Check whether --with-wxwidgets was given. -if test "${with_wxwidgets+set}" = set; then : - withval=$with_wxwidgets; -else - with_wxwidgets="no" -fi - - - # Check whether --with-netcdf was given. if test "${with_netcdf+set}" = set; then : withval=$with_netcdf; diff --git a/configure.ac b/configure.ac index 55862a00b6a..9324d4e6a0c 100644 --- a/configure.ac +++ b/configure.ac @@ -309,12 +309,6 @@ AC_ARG_WITH(pdal, e.g. '--with-pdal=/usr/local/bin/pdal-config', default: no)],, with_pdal="no") -AC_ARG_WITH(wxwidgets, -[ --with-wxwidgets[=path/wx-config] - enable wxWidgets support (wx-config with path, - e.g. '--with-wxwidgets=/usr/local/bin/wx-config', - default: no)],, with_wxwidgets="no") - AC_ARG_WITH(netcdf, [ --with-netcdf[=path/nc-config] enable NetCDF support (nc-config with path, diff --git a/mswindows/crosscompile.sh b/mswindows/crosscompile.sh index b879c3f8695..2cc0da29711 100755 --- a/mswindows/crosscompile.sh +++ b/mswindows/crosscompile.sh @@ -131,7 +131,6 @@ LDFLAGS="-lcurses" \ ./configure \ --with-nls \ --with-readline \ ---with-wxwidgets \ --with-freetype-includes=$freetype_include \ --with-bzlib \ --with-postgres \ @@ -189,7 +188,6 @@ PKG_CONFIG=$mxe_bin-pkg-config \ --host=$arch \ --with-nls \ --with-readline \ ---with-wxwidgets \ --with-freetype-includes=$mxe_shared/include/freetype2 \ --with-bzlib \ --with-postgres \ diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index 0c1c10d0460..6da7e9eed5c 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -45,7 +45,6 @@ export ARCH=x86_64-w64-mingw32 --with-fftw \ --with-nls \ --with-readline \ - --with-wxwidgets \ --with-blas \ --with-lapack-includes=/mingw64/include/lapack \ --with-freetype \ diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh index c0750583db7..2428924ef60 100755 --- a/mswindows/osgeo4w/package.sh +++ b/mswindows/osgeo4w/package.sh @@ -190,7 +190,6 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then --with-lapack \ --with-lapack-includes=/mingw64/include \ --with-openmp \ - --with-wxwidgets \ --with-cairo \ --with-cairo-includes=$OSGEO4W_ROOT_MSYS/include \ --with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ diff --git a/rpm/grass.spec b/rpm/grass.spec index 990f92e0c3a..d3e9adfea45 100644 --- a/rpm/grass.spec +++ b/rpm/grass.spec @@ -221,7 +221,6 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-regex \ --with-openmp \ --with-gdal=%{_bindir}/gdal-config \ - --with-wxwidgets=%{_bindir}/wx-config \ --with-geos=%{_bindir}/geos-config \ %if (0%{?rhel} > 6 || 0%{?fedora}) --with-netcdf=%{_bindir}/nc-config \ diff --git a/utils/vagrant/compile.sh b/utils/vagrant/compile.sh index e726ccb95c7..1f620fced5c 100755 --- a/utils/vagrant/compile.sh +++ b/utils/vagrant/compile.sh @@ -43,7 +43,6 @@ if [ ! -f "include/Make/Platform.make" ] ; then --with-postgres-includes=`pg_config --includedir` \ --with-mysql-includes=`mysql_config --include | sed -e 's/-I//'` \ --with-proj-share=/usr/share/proj \ - --with-wxwidgets=/usr/bin/wx-config \ --with-python \ --with-cairo \ --with-liblas