From c7b4cd30cf55b22b28c88b44269fea20e62ad5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 23 Nov 2024 15:42:22 +0000
Subject: [PATCH 1/3] CI(OSGeo4W): Split msys2 package list to separate sorted
 lines

---
 .github/workflows/osgeo4w.yml | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index 4a860f430f5..b5729bad42a 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -38,12 +38,31 @@ jobs:
           location: D:\
           update: true
           msystem: MINGW64
-          install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain
-            mingw-w64-x86_64-fftw mingw-w64-x86_64-openblas 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
+          install: >-
+            bison
+            diffutils
+            dos2unix
+            flex
+            git
+            libintl
+            make
+            mingw-w64-x86_64-bzip2
+            mingw-w64-x86_64-ccache
+            mingw-w64-x86_64-fftw
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-gettext
+            mingw-w64-x86_64-libiconv
+            mingw-w64-x86_64-libpng
+            mingw-w64-x86_64-libsystre
+            mingw-w64-x86_64-libtre-git
+            mingw-w64-x86_64-libwinpthread-git
+            mingw-w64-x86_64-openblas
             mingw-w64-x86_64-pcre
+            mingw-w64-x86_64-pkgconf
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-zlib
+            tar
+            zip
 
       - name: Setup OSGeo4W environment
         uses: echoix/setup-OSGeo4W@17deecd39e077a80bf1081443998ea8edd6f15bf  # v0.1.0

From 417aa855e3033cac641e87f2764ff9af408773da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 23 Nov 2024 15:49:14 +0000
Subject: [PATCH 2/3] CI(OSGeo4W): Use pacboy to write shorter package names

The suffix `:p` means to install for the current env only (MINGW_PACKAGE_PREFIX). This allows to have the same package name for different msys2 environments
---
 .github/workflows/osgeo4w.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index b5729bad42a..140c8425a0f 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -46,23 +46,24 @@ jobs:
             git
             libintl
             make
-            mingw-w64-x86_64-bzip2
-            mingw-w64-x86_64-ccache
-            mingw-w64-x86_64-fftw
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-gettext
-            mingw-w64-x86_64-libiconv
-            mingw-w64-x86_64-libpng
-            mingw-w64-x86_64-libsystre
-            mingw-w64-x86_64-libtre-git
-            mingw-w64-x86_64-libwinpthread-git
-            mingw-w64-x86_64-openblas
-            mingw-w64-x86_64-pcre
-            mingw-w64-x86_64-pkgconf
-            mingw-w64-x86_64-toolchain
-            mingw-w64-x86_64-zlib
             tar
             zip
+          pacboy: >-
+            bzip2:p
+            ccache:p
+            fftw:p
+            gcc:p
+            gettext:p
+            libiconv:p
+            libpng:p
+            libsystre:p
+            libtre-git:p
+            libwinpthread-git:p
+            openblas:p
+            pcre:p
+            pkgconf:p
+            toolchain:p
+            zlib:p
 
       - name: Setup OSGeo4W environment
         uses: echoix/setup-OSGeo4W@17deecd39e077a80bf1081443998ea8edd6f15bf  # v0.1.0

From 61b7ae3a465381a5e712e8868d5df329586cfeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 23 Nov 2024 16:40:04 +0000
Subject: [PATCH 3/3] CI(OSGeo4W): Remove pacboy suffixes

Not needed since https://github.com/msys2/pactoys/pull/6 changed the defaults when no suffix, and doesn't install for `mingw32` and `mingw64` anymore, only for the current env
---
 .github/workflows/osgeo4w.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index 140c8425a0f..4ed506fd074 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -49,21 +49,21 @@ jobs:
             tar
             zip
           pacboy: >-
-            bzip2:p
-            ccache:p
-            fftw:p
-            gcc:p
-            gettext:p
-            libiconv:p
-            libpng:p
-            libsystre:p
-            libtre-git:p
-            libwinpthread-git:p
-            openblas:p
-            pcre:p
-            pkgconf:p
-            toolchain:p
-            zlib:p
+            bzip2
+            ccache
+            fftw
+            gcc
+            gettext
+            libiconv
+            libpng
+            libsystre
+            libtre-git
+            libwinpthread-git
+            openblas
+            pcre
+            pkgconf
+            toolchain
+            zlib
 
       - name: Setup OSGeo4W environment
         uses: echoix/setup-OSGeo4W@17deecd39e077a80bf1081443998ea8edd6f15bf  # v0.1.0