From cd15def6525504748c337e232be4c1b398dda15d Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 12:09:56 +0200 Subject: [PATCH 1/8] use msys2-setup --- .github/workflows/osgeo4w.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index 0a1ba6af177..2d1361b9361 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -27,6 +27,11 @@ jobs: git config --global core.autocrlf false git config --global core.eol lf - uses: actions/checkout@v2 + - uses: msys2/setup-msys2@v2 + with: + msystem: MINGW64 + update: true + install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six - name: Install OSGeo4W run: | @@ -35,9 +40,6 @@ jobs: (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 - - name: Install MSYS2 packages - run: C:\msys64\usr\bin\pacman.exe --noconfirm -S tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkg-config mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six - - name: Compile GRASS GIS run: C:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location) From 2abcca53d5a8b3447824283c0282d1d8d189a186 Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 14:58:14 +0200 Subject: [PATCH 2/8] specify location --- .github/workflows/osgeo4w.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index 2d1361b9361..69e84db65b8 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -29,7 +29,8 @@ jobs: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 with: - msystem: MINGW64 + path-type: inherit + location: D:\ update: true install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six @@ -41,13 +42,13 @@ jobs: 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 - name: Compile GRASS GIS - run: C:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location) + run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location) - name: Test executing of the grass command run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass83.bat' - name: Test executing of the grass command in bash - run: C:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh + run: D:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh - name: Run tests run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass83.bat' 'C:\OSGeo4W\bin\python3' From 13416dcb4a344c7805cf07fcc7d46afc1c4492ef Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 16:20:42 +0200 Subject: [PATCH 3/8] get OSGeo4W includes for cairo --- mswindows/osgeo4w/build_osgeo4w.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index 9480381bdf0..45881e9914d 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -66,7 +66,7 @@ export ARCH=x86_64-w64-mingw32 --with-zstd \ --with-odbc \ --with-cairo \ - --with-cairo-includes=${SRC}/include \ + --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \ --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ --with-opengl=windows \ --with-bzlib \ From 17ca3c9aa4ad9bf452288758e893dce4546e571a Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 21:10:46 +0200 Subject: [PATCH 4/8] try to deactivate fontconfig --- mswindows/osgeo4w/build_osgeo4w.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index 45881e9914d..75ddefee892 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -67,7 +67,7 @@ export ARCH=x86_64-w64-mingw32 --with-odbc \ --with-cairo \ --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \ - --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ + --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo" # -lfontconfig" \ # temporary dectivate fontconfig on osgeo4w --with-opengl=windows \ --with-bzlib \ --with-liblas=${SRC}/mswindows/osgeo4w/liblas-config \ From 8c958875d7944679071c7917cdf9c3c32398e98e Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 22:52:59 +0200 Subject: [PATCH 5/8] remove msys2 cairo --- .github/workflows/osgeo4w.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index 69e84db65b8..e645585dcc1 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -32,7 +32,7 @@ jobs: path-type: inherit location: D:\ update: true - install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-cairo mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six + install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw mingw-w64-x86_64-lapack mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng mingw-w64-x86_64-pcre mingw-w64-x86_64-python3-six - name: Install OSGeo4W run: | From ef449f8fbe77c74e9e3c821df1277c0f4d13dccf Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 22:55:11 +0200 Subject: [PATCH 6/8] link osgeo4w cairo --- mswindows/osgeo4w/build_osgeo4w.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index 75ddefee892..26b4e8c466e 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -49,7 +49,7 @@ export ARCH=x86_64-w64-mingw32 --with-blas \ --with-lapack-includes=/mingw64/include/lapack \ --with-freetype \ - --with-freetype-includes=/mingw64/include/freetype2 \ + --with-freetype-includes=${OSGEO4W_ROOT_MSYS}/include/freetype2 \ --with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \ --with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \ --with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \ @@ -67,7 +67,7 @@ export ARCH=x86_64-w64-mingw32 --with-odbc \ --with-cairo \ --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \ - --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo" # -lfontconfig" \ # temporary dectivate fontconfig on osgeo4w + --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ --with-opengl=windows \ --with-bzlib \ --with-liblas=${SRC}/mswindows/osgeo4w/liblas-config \ From 42db0f2e130aae50e72b18d9ea4a67c2b66bc2db Mon Sep 17 00:00:00 2001 From: ninsbl Date: Tue, 2 Aug 2022 23:08:31 +0200 Subject: [PATCH 7/8] link osgeo4w cairo libs --- mswindows/osgeo4w/build_osgeo4w.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index 26b4e8c466e..a1b554f6a18 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -67,6 +67,7 @@ export ARCH=x86_64-w64-mingw32 --with-odbc \ --with-cairo \ --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \ + --with-cairo-libs=$OSGEO4W_ROOT_MSYS/lib \ --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ --with-opengl=windows \ --with-bzlib \ From 50770b94fd8df1ebd0edd94b41c112f0c98f5e0e Mon Sep 17 00:00:00 2001 From: Stefan Blumentrath Date: Tue, 2 Aug 2022 23:43:57 +0200 Subject: [PATCH 8/8] no fontconfig --- mswindows/osgeo4w/build_osgeo4w.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh index a1b554f6a18..0c1c10d0460 100644 --- a/mswindows/osgeo4w/build_osgeo4w.sh +++ b/mswindows/osgeo4w/build_osgeo4w.sh @@ -68,7 +68,7 @@ export ARCH=x86_64-w64-mingw32 --with-cairo \ --with-cairo-includes=${OSGEO4W_ROOT_MSYS}/include \ --with-cairo-libs=$OSGEO4W_ROOT_MSYS/lib \ - --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo -lfontconfig" \ + --with-cairo-ldflags="-L${SRC}/mswindows/osgeo4w/lib -lcairo" \ --with-opengl=windows \ --with-bzlib \ --with-liblas=${SRC}/mswindows/osgeo4w/liblas-config \