[GRASS-git] [OSGeo/grass] 161658: win: patch from OSGeo4W applied (#4121)

[Martin Landa]

  Branch: refs/heads/main
  Home:   https://github.com/OSGeo/grass
  Commit: 161658b94c323fffa2db7ea3d1ffe7d54d05bff3
      https://github.com/OSGeo/grass/commit/161658b94c323fffa2db7ea3d1ffe7d54d05bff3
  Author: Martin Landa <landa.martin at gmail.com>
  Date:   2024-12-15 (Sun, 15 Dec 2024)

  Changed paths:
    M .github/workflows/osgeo4w.yml
    M mswindows/osgeo4w/build_osgeo4w.sh
    M mswindows/osgeo4w/env.bat.tmpl
    M mswindows/osgeo4w/libpng-config
    M mswindows/osgeo4w/package.sh

  Log Message:
  -----------
  win: patch from OSGeo4W applied (#4121)

* patch from https://github.com/jef-n/OSGeo4W/blob/master/src/grass/osgeo4w/patch applied

* attempt to fix osgeo4w CI

* re-introduce mingw-w64-x86_64-libpng

* sync with osgeo4w patch

* add NumPy into deps in order to fix some tests

* CI(OSGeo4W): Sort OSGeo4W packages in a multiline list

* Add back matplotlib package

* style: Sort packages and configure flags in mswindows build scripts

* packaging: Removed changes from patch that was removed upstream

https://github.com/jef-n/OSGeo4W/commit/c678c71d080e5c33e8cb64b12386be2ca4b6c54a

* packaging: Apply upstream patch update

https://github.com/jef-n/OSGeo4W/commit/4bd721f07ac8036274328a9e4500c1fa944a0926

* packaging: Keep --with-libpng with libpng-config from repo

* CI: Split msys2 packages on multiple lines, using pacboy for environment-specific packages

* Remove DLL list as unused after applying latest patch

The dll files are copied with the following line, which doesn't need to use that list anymore

# copy dependencies
cp -uv $(/usr/bin/find apps/grass/grass$POSTFIX -iname "*.dll" -o -iname "*.exe" | PATH=$PWD/apps/grass/grass$POSTFIX/lib:$PWD/bin:/mingw64/bin:/usr/bin /usr/bin/xargs /usr/bin/ldd | /usr/bin/sed -ne 's#^.* => \(/mingw64/bin/.*\) (.*)$#\1#p' | /usr/bin/sort -u) apps/grass/grass$POSTFIX/bin

---------

Co-authored-by: Edouard Choinière <27212526+echoix at users.noreply.github.com>
Co-authored-by: Jürgen Fischer <jef at norbit.de>



To unsubscribe from these emails, change your notification settings at https://github.com/OSGeo/grass/settings/notifications