From ae4db13ce179e2e2fc14e73d7bb2900eeca6f9a7 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Sun, 19 Feb 2023 14:34:01 -0500
Subject: [PATCH 01/14] Update to 22.1.0

---
 .github/workflows/build_local.yml      |  2 +-
 .github/workflows/build_monolithic.yml | 34 +++-----------------------
 build_local.sh                         |  2 +-
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build_local.yml b/.github/workflows/build_local.yml
index 53e8ec4..a42cb65 100644
--- a/.github/workflows/build_local.yml
+++ b/.github/workflows/build_local.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CROSS_OVER_VERSION: [22.0.1] # 22.0.0, 21.2.0, 21.1.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
+        CROSS_OVER_VERSION: [22.1.0] # 22.0.1, 22.0.0, 21.2.0, 21.1.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
 
     runs-on:  macos-latest
 
diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index 0a8a34c..b798d6f 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -24,8 +24,8 @@ jobs:
     runs-on:  macos-latest
     env:
       # crossover source code to be downloaded
-      CROSS_OVER_SOURCE_URL: https://media.codeweavers.com/pub/crossover/source/crossover-sources-21.2.0.tar.gz
-      CROSS_OVER_LOCAL_FILE: crossover-22.0.1
+      CROSS_OVER_SOURCE_URL: https://media.codeweavers.com/pub/crossover/source/crossover-sources-22.1.0.tar.gz
+      CROSS_OVER_LOCAL_FILE: crossover-22.1.0
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -77,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CROSS_OVER_VERSION: [22.0.1, 21.2.0, 20.0.4, 19.0.2] # 22.0.0, 21.1.0, 21.0.0, 20.0.2, 20.0.1, 20.0.0, 19.0.1, 19.0.0
+        CROSS_OVER_VERSION: [22.1.0, 21.2.0, 20.0.4, 19.0.2] #22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.2, 20.0.1, 20.0.0, 19.0.1, 19.0.0
     runs-on:  macos-latest
 
     env:
@@ -276,31 +276,3 @@ jobs:
         with:
           name: ${{ env.WINE_INSTALLATION }}
           path: ${{ env.INSTALLROOT }}/${{ env.WINE_INSTALLATION }}.tar.gz
-
-  wine-crossover-local:
-
-    strategy:
-      fail-fast: false
-      matrix:
-        CROSS_OVER_VERSION: [22.0.1] # 22.0.0, 21.2.0, 20.0.4, 19.0.2, 21.1.0, 21.0.0, 20.0.2, 20.0.1, 20.0.0
-    runs-on:  macos-latest
-    needs: wine-crossover
-
-    env:
-      CROSS_OVER_VERSION: ${{ matrix.CROSS_OVER_VERSION }}
-      # this has to be synchronized with the same variable in build_local.sh
-      PACKAGE_UPLOAD: ${{ github.workspace }}/upload
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Run build_local.sh
-        run: ./build_local.sh
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifacts-build_local-wine-cx${{ matrix.CROSS_OVER_VERSION }}
-          path: ${{ env.PACKAGE_UPLOAD }}
diff --git a/build_local.sh b/build_local.sh
index 99896ef..9a27e52 100755
--- a/build_local.sh
+++ b/build_local.sh
@@ -18,7 +18,7 @@ endgroup() {
 export GITHUB_WORKSPACE=$(pwd)
 
 if [ -z "$CROSS_OVER_VERSION" ]; then
-    export CROSS_OVER_VERSION=22.0.1
+    export CROSS_OVER_VERSION=22.1.0
     echo "CROSS_OVER_VERSION not set building crossover-wine-${CROSS_OVER_VERSION}"
 fi
 

From 48a4d3637231f971131ea727d666ff51ef8e706a Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:12:38 -0500
Subject: [PATCH 02/14] Update build_monolithic.yml

[skip ci]
---
 .github/workflows/build_monolithic.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index b798d6f..414ca1b 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -77,7 +77,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CROSS_OVER_VERSION: [22.1.0, 21.2.0, 20.0.4, 19.0.2] #22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.2, 20.0.1, 20.0.0, 19.0.1, 19.0.0
+        # Only build versions supported by winetricks
+        CROSS_OVER_VERSION: [22.1.0, 21.2.0] #22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
     runs-on:  macos-latest
 
     env:
@@ -110,11 +111,7 @@ jobs:
       - name: Install Wine Runtime Dependencies
         run: |
           brew install  freetype           \
-                        gphoto2            \
-                        gst-plugins-base   \
-                        krb5               \
                         molten-vk          \
-                        sane-backends      \
                         sdl2
 
       - name: Install Wine Runtime Dependencies (pre 22)
@@ -125,13 +122,12 @@ jobs:
                         libpng             \
                         mpg123
 
-      - name: Add bison, cx-llvm, flex & krb5 to $PATH
+      - name: Add bison, cx-llvm & flex to $PATH
         run: |
           set -x
           echo "$(brew --prefix bison)/bin"   >> $GITHUB_PATH
           echo "$(brew --prefix cx-llvm)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix flex)/bin"    >> $GITHUB_PATH
-          echo "$(brew --prefix krb5)/bin"    >> $GITHUB_PATH
 
       - name: Download MoltenVK / DXVK (from previous job)
         uses: actions/download-artifact@v3

From 7437cccb7e6676ca59c4d744875dee55dc9009a7 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:21:15 -0500
Subject: [PATCH 03/14] Update build_monolithic.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed “moltenVK_DXVK” this stage now fails with dxvk.
---
 .github/workflows/build_monolithic.yml | 70 --------------------------
 1 file changed, 70 deletions(-)

diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index 414ca1b..cfea6d5 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -20,60 +20,7 @@ env:
     MOLTENVK_DXVK_INSTALLATION: moltenvk-dxvk
 
 jobs:
-  moltenVK_DXVK:
-    runs-on:  macos-latest
-    env:
-      # crossover source code to be downloaded
-      CROSS_OVER_SOURCE_URL: https://media.codeweavers.com/pub/crossover/source/crossover-sources-22.1.0.tar.gz
-      CROSS_OVER_LOCAL_FILE: crossover-22.1.0
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      ############ Restore MoltenVK / DXVK from cache ##############
-
-      - name: Restore MoltenVK / DXVK from cache
-        uses: actions/cache@v3
-        id: cache_moltenVK_DXVK
-        with:
-          path: ${{ env.INSTALLROOT }}/${{ env.MOLTENVK_DXVK_INSTALLATION }}
-          key: cache_moltenVK_DXVK_v6
-
-      ############ Build MoltenVK / DXVK (if restore from cache failed) ##############
-
-      - name: Get and Extract Source
-        if:  steps.cache_moltenVK_DXVK.outputs.cache-hit != 'true'
-        uses: ./.github/actions/get_source
-        with:
-          crossover-local-file: "${{ env.CROSS_OVER_LOCAL_FILE }}"
-          crossover-source-url: "${{ env.CROSS_OVER_SOURCE_URL }}"
-
-      - name: Build / Install MoltenVK and DXVK (if restore from cache failed)
-        if:  steps.cache_moltenVK_DXVK.outputs.cache-hit != 'true'
-        uses: ./.github/actions/build_moltenvk_dxvk
-        with:
-          install-prefix: "${{ env.INSTALLROOT }}/${{ env.MOLTENVK_DXVK_INSTALLATION }}"
-
-      ############ Upload MoltenVK / DXVK to be used in subsequent jobs ##############
-
-      - name: Tar MoltenVK / DXVK
-        run: |
-          set -x
-          pushd ${{ env.INSTALLROOT }}
-          tar -czf ${{ env.MOLTENVK_DXVK_INSTALLATION }}.tar.gz ${{ env.MOLTENVK_DXVK_INSTALLATION }}
-          ls -alt
-          popd
-
-      - name: Upload MoltenVK / DXVK
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.MOLTENVK_DXVK_INSTALLATION }}
-          path: ${{ env.INSTALLROOT }}/${{ env.MOLTENVK_DXVK_INSTALLATION }}.tar.gz
-
-
   wine-crossover:
-    needs: [moltenVK_DXVK]
-
     strategy:
       fail-fast: false
       matrix:
@@ -87,7 +34,6 @@ jobs:
       CROSS_OVER_LOCAL_FILE: crossover-${{ matrix.CROSS_OVER_VERSION }}
       # artifact names
       WINE_INSTALLATION: wine-cx${{ matrix.CROSS_OVER_VERSION }}
-      DXVK_INSTALLATION: dxvk-cx${{ matrix.CROSS_OVER_VERSION }}
 
     steps:
 
@@ -129,22 +75,6 @@ jobs:
           echo "$(brew --prefix cx-llvm)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix flex)/bin"    >> $GITHUB_PATH
 
-      - name: Download MoltenVK / DXVK (from previous job)
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.MOLTENVK_DXVK_INSTALLATION }}
-          path: ${{ env.INSTALLROOT }}
-
-      - name: Unpack MoltenVK / DXVK
-        run: |
-          set -x
-          mkdir -p ${{ env.INSTALLROOT }}/${{ env.WINE_INSTALLATION }}
-          pushd ${{ env.INSTALLROOT }}/${{ env.WINE_INSTALLATION }}
-          ls -al
-          tar --strip-components=1 -xvf ${{ env.INSTALLROOT }}/${{ env.MOLTENVK_DXVK_INSTALLATION }}.tar.gz
-          ls -alt
-          popd
-
       ############ Download and Prepare Source Code ##############
 
       - name: Get and Extract Source

From 99439480c81787d748d11f30d35c7b92eba7fc22 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:42:08 -0500
Subject: [PATCH 04/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index 8bfa786..7fbab21 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -45,12 +45,10 @@ runs:
         run: |
           set -x
 
-          export GPHOTO2_CFLAGS="-I$(brew --prefix libgphoto2)/include -I$(brew --prefix libgphoto2)/include/gphoto2"
-          export GPHOTO2_PORT_CFLAGS="-I$(brew --prefix libgphoto2)/include -I$(brew --prefix libgphoto2)/include/gphoto2"
-          export SDL2_CFLAGS="-I$(brew --prefix sdl2)/include -I$(brew --prefix sdl2)/include/SDL2"
-
+          export ac_cv_lib_soname_MoltenVK="libMoltenVK.dylib"
           export ac_cv_lib_soname_vulkan=""
-          export ac_cv_lib_soname_MoltenVK="$(brew --prefix molten-vk)/lib/libMoltenVK.dylib"
+
+          export SDL2_CFLAGS="-I$(brew --prefix sdl2)/include -I$(brew --prefix sdl2)/include/SDL2"
 
           mkdir -p ${{ inputs.build-dir }}/
           pushd ${{ inputs.build-dir }}
@@ -60,14 +58,18 @@ runs:
                     --without-alsa \
                     --without-capi \
                     --without-dbus \
+                    --without-gsm \
                     --without-inotify \
+                    --without-krb5 \
+                    --without-netapi \
+                    --without-openal \
                     --without-oss \
                     --without-pulse \
+                    --without-quicktime \
+                    --without-sane \
                     --without-udev \
                     --without-usb \
                     --without-v4l2 \
-                    --without-gsm \
-                    --without-quicktime \
                     --without-x \
                     ${{ inputs.configure-params }} || cat config.log
           popd

From e968b45166669d039982183ba46d920ddceecd89 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:10:07 -0400
Subject: [PATCH 05/14] build_local: Update to 22.1.1 [skip ci]

---
 .github/workflows/build_local.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_local.yml b/.github/workflows/build_local.yml
index a42cb65..b056b49 100644
--- a/.github/workflows/build_local.yml
+++ b/.github/workflows/build_local.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CROSS_OVER_VERSION: [22.1.0] # 22.0.1, 22.0.0, 21.2.0, 21.1.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
+        CROSS_OVER_VERSION: [22.1.1] # 22.1.0, 22.0.1, 22.0.0, 21.2.0, 21.1.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
 
     runs-on:  macos-latest
 

From 1b9802cd29627bfbe960e4fc9815a9691a932409 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:11:02 -0400
Subject: [PATCH 06/14] build_monolithic: Update to 22.1.1 [skip ci]

---
 .github/workflows/build_monolithic.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index cfea6d5..10d6c5c 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         # Only build versions supported by winetricks
-        CROSS_OVER_VERSION: [22.1.0, 21.2.0] #22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
+        CROSS_OVER_VERSION: [22.1.1, 21.2.0] #22.1.0, 22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
     runs-on:  macos-latest
 
     env:

From 76995df69c0f6c785e915194c6eb1a370ff8cbf9 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:11:52 -0400
Subject: [PATCH 07/14] build_local.sh: Update to 22.1.1 [skip ci]

---
 build_local.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_local.sh b/build_local.sh
index 9a27e52..71f514d 100755
--- a/build_local.sh
+++ b/build_local.sh
@@ -18,7 +18,7 @@ endgroup() {
 export GITHUB_WORKSPACE=$(pwd)
 
 if [ -z "$CROSS_OVER_VERSION" ]; then
-    export CROSS_OVER_VERSION=22.1.0
+    export CROSS_OVER_VERSION=22.1.1
     echo "CROSS_OVER_VERSION not set building crossover-wine-${CROSS_OVER_VERSION}"
 fi
 

From bf83be3042c4c1e95efcfdb35ebac4fa6154a907 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:13:57 -0400
Subject: [PATCH 08/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index 7fbab21..55b9038 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -6,7 +6,7 @@ inputs:
     required: true
     default: "wine64"
   crossflags:
-    descriptions: 'CROSSFLAGS to be given to ming-w64'
+    descriptions: 'CROSSCFLAGS to be given to ming-w64'
     required: true
     default: "-g -O2"
   cflags:
@@ -15,7 +15,7 @@ inputs:
     # Xcode12 by default enables '-Werror,-Wimplicit-function-declaration' (49917738)
     # this causes wine(64) builds to fail so needs to be disabled.
     # https://developer.apple.com/documentation/xcode-release-notes/xcode-12-release-notes    
-    default: "-g -O2 -Wno-implicit-function-declaration -Wno-deprecated-declarations -Wno-format"
+    default: "-g -O2 -Wno-error=implicit-function-declaration -Wno-deprecated-declarations -Wno-format"
   ldflags:
     descriptions: 'LDFLAGS to be given to clang'
     required: true

From 8766a3dc238227a5b8250600a0ac4cd4c632adcf Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:32:05 -0400
Subject: [PATCH 09/14] Update build_monolithic.yml

---
 .github/workflows/build_monolithic.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index 10d6c5c..a1be635 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         # Only build versions supported by winetricks
-        CROSS_OVER_VERSION: [22.1.1, 21.2.0] #22.1.0, 22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
+        CROSS_OVER_VERSION: [22.1.1, 21.2.0, 20.0.4, 19.0.2] #22.1.0, 22.0.1 22.0.0, 21.1.0, 21.0.0, 20.0.4, 20.0.2, 20.0.1, 20.0.0, 19.0.2, 19.0.1, 19.0.0
     runs-on:  macos-latest
 
     env:

From e44d891679434bc465b5b0913b381d87c141ece2 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:50:21 -0400
Subject: [PATCH 10/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index 55b9038..c8e40a9 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -19,7 +19,7 @@ inputs:
   ldflags:
     descriptions: 'LDFLAGS to be given to clang'
     required: true
-    default: "-Wl,-headerpad_max_install_names"
+    default: "-Wl,-headerpad_max_install_names -Wl,-no_compact_unwind"
   build-dir:
     description: 'Build directory'
     required: true

From f0ccfb2164983a34221012843040341ea9e72987 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:04:22 -0400
Subject: [PATCH 11/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index c8e40a9..3651118 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -13,9 +13,9 @@ inputs:
     descriptions: 'CFLAGS to be given to clang'
     required: true
     # Xcode12 by default enables '-Werror,-Wimplicit-function-declaration' (49917738)
-    # this causes wine(64) builds to fail so needs to be disabled.
-    # https://developer.apple.com/documentation/xcode-release-notes/xcode-12-release-notes    
-    default: "-g -O2 -Wno-error=implicit-function-declaration -Wno-deprecated-declarations -Wno-format"
+    #  this causes wine(64|32on64) builds to fail so needs to be dowbgraded back to a warning.
+    #  see: https://developer.apple.com/documentation/xcode-release-notes/xcode-12-release-notes    
+    default: "-g -O2 -Wno-error=implicit-function-declaration -Wno-deprecated-declarations"
   ldflags:
     descriptions: 'LDFLAGS to be given to clang'
     required: true
@@ -28,7 +28,7 @@ inputs:
     required: true
     default: ${{ github.workspace }}/sources/wine/configure
   configure-params:
-    description: 'additional parameters to be given to the wine configure script'
+    description: 'Additional parameters to be given to configure'
     required: true
     default: "--enable-win64 --with-vulkan"
 runs:
@@ -48,7 +48,7 @@ runs:
           export ac_cv_lib_soname_MoltenVK="libMoltenVK.dylib"
           export ac_cv_lib_soname_vulkan=""
 
-          export SDL2_CFLAGS="-I$(brew --prefix sdl2)/include -I$(brew --prefix sdl2)/include/SDL2"
+          export CPATH="$(brew --prefix)/include"
 
           mkdir -p ${{ inputs.build-dir }}/
           pushd ${{ inputs.build-dir }}

From cecf90922cb9809f21266495d9e69fe7df220e16 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:05:32 -0400
Subject: [PATCH 12/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index 3651118..440df42 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -6,7 +6,7 @@ inputs:
     required: true
     default: "wine64"
   crossflags:
-    descriptions: 'CROSSCFLAGS to be given to ming-w64'
+    descriptions: 'CFLAGS to be given to ming-w64-gcc'
     required: true
     default: "-g -O2"
   cflags:

From fec21765774c95c0c1478fbf2f8ba51a15f7fa97 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:20:05 -0400
Subject: [PATCH 13/14] Update action.yml

---
 .github/actions/configure_wine/action.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/actions/configure_wine/action.yml b/.github/actions/configure_wine/action.yml
index 440df42..8b8f5d2 100644
--- a/.github/actions/configure_wine/action.yml
+++ b/.github/actions/configure_wine/action.yml
@@ -58,6 +58,8 @@ runs:
                     --without-alsa \
                     --without-capi \
                     --without-dbus \
+                    --without-gettext \
+                    --without-gettextpo \
                     --without-gsm \
                     --without-inotify \
                     --without-krb5 \

From 7f011822e56493d129731cafa392bf3fb5d5a344 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:25:04 -0400
Subject: [PATCH 14/14] Update build_monolithic.yml

---
 .github/workflows/build_monolithic.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_monolithic.yml b/.github/workflows/build_monolithic.yml
index a1be635..327b2ea 100644
--- a/.github/workflows/build_monolithic.yml
+++ b/.github/workflows/build_monolithic.yml
@@ -51,6 +51,7 @@ jobs:
           brew install  bison              \
                         gcenx/wine/cx-llvm \
                         flex               \
+                        gettext            \
                         mingw-w64          \
                         pkgconfig