Update patch used

Author: mcarans

mingw-w64-espeak-ng/MSYS2_MinGW64.patch

@@ -1,7 +1,7 @@
 From 6f07580b8dd6ec0cf3419d5bceff097de2e213df Mon Sep 17 00:00:00 2001
 From: mcarans <rans@email.com>
 Date: Sun, 21 Sep 2025 17:31:01 +1200
-Subject: [PATCH 1/5] audio_object_flush before fifo_stop
+Subject: [PATCH 1/6] audio_object_flush before fifo_stop
 
 ---
  src/libespeak-ng/speech.c | 10 +++++-----
@@ -36,7 +36,7 @@ index 3c36e9a5a..beec848b8 100644
 From 247839fa8ee9b3cf327c4b836441a0d4be0e6e0d Mon Sep 17 00:00:00 2001
 From: Mike <rans@email.com>
 Date: Tue, 30 Sep 2025 09:50:14 +1300
-Subject: [PATCH 2/5] Change path separator for mingw64
+Subject: [PATCH 2/6] Change path separator for mingw64
 
 ---
  src/libespeak-ng/speech.h | 7 ++++++-
@@ -67,7 +67,7 @@ index ee81d0526..bf57d3b16 100644
 From 553d189ee384a303846b0e2e2bf5cdfccff640e6 Mon Sep 17 00:00:00 2001
 From: Mike <rans@email.com>
 Date: Wed, 1 Oct 2025 09:49:15 +1300
-Subject: [PATCH 3/5] Change back speech.h to original Add msys2path conversion
+Subject: [PATCH 3/6] Change back speech.h to original Add msys2path conversion
  to CMakeLists.txt for mingw only
 
 ---
@@ -138,7 +138,7 @@ index bf57d3b16..ee81d0526 100644
 From 31373ca6a54be87247f0c84e874c1e37ed08a10d Mon Sep 17 00:00:00 2001
 From: Mike <rans@email.com>
 Date: Wed, 1 Oct 2025 10:22:56 +1300
-Subject: [PATCH 4/5] Fix msys2path
+Subject: [PATCH 4/6] Fix msys2path
 
 ---
  cmake/msys2path.cmake           | 8 ++++++++
@@ -192,7 +192,7 @@ index 4c12244cd..281908db6 100644
 From 67d8e09ae8c3378a6e9862fc319d9991a4a9dd88 Mon Sep 17 00:00:00 2001
 From: Mike <rans@email.com>
 Date: Wed, 1 Oct 2025 10:35:05 +1300
-Subject: [PATCH 5/5] Fix msys2path
+Subject: [PATCH 5/6] Fix msys2path
 
 ---
  cmake/msys2path.cmake | 3 ++-
@@ -212,3 +212,95 @@ index 0d015f2a9..7c6cb491c 100644
      endif ()
  endfunction()
 \ No newline at end of file
+
+From b4dff5ad0b0a158a5a87f3565b17b2fe549e57c8 Mon Sep 17 00:00:00 2001
+From: Mike <rans@email.com>
+Date: Thu, 13 Nov 2025 20:08:57 +1300
+Subject: [PATCH 6/6] Path fixes
+
+---
+ cmake/msys2path.cmake           | 18 ------------------
+ src/libespeak-ng/CMakeLists.txt | 11 +----------
+ src/libespeak-ng/speech.h       |  7 ++++++-
+ src/libespeak-ng/voices.c       |  2 +-
+ 4 files changed, 8 insertions(+), 30 deletions(-)
+ delete mode 100644 cmake/msys2path.cmake
+
+diff --git a/cmake/msys2path.cmake b/cmake/msys2path.cmake
+deleted file mode 100644
+index 7c6cb491c..000000000
+--- a/cmake/msys2path.cmake
++++ /dev/null
+@@ -1,18 +0,0 @@
+-# Usage: msys2_to_windows("${msys_path}" win_path)
+-
+-function(msys_to_windows MsysPath WinPath)
+-    execute_process(
+-            COMMAND cygpath -w "${MsysPath}"
+-            OUTPUT_VARIABLE converted_path
+-            OUTPUT_STRIP_TRAILING_WHITESPACE
+-            ERROR_VARIABLE err
+-            RESULT_VARIABLE res
+-    )
+-    if(NOT res EQUAL 0)
+-        message(WARNING "cygpath failed: ${err}")
+-        set(${WinPath} "${MsysPath}" PARENT_SCOPE)
+-    else ()
+-        string(REPLACE "\\" "/" norm_path "${converted_path}")
+-        set(${WinPath} "${norm_path}" PARENT_SCOPE)
+-    endif ()
+-endfunction()
+\ No newline at end of file
+diff --git a/src/libespeak-ng/CMakeLists.txt b/src/libespeak-ng/CMakeLists.txt
+index 281908db6..bb39dc281 100644
+--- a/src/libespeak-ng/CMakeLists.txt
++++ b/src/libespeak-ng/CMakeLists.txt
+@@ -69,16 +69,7 @@ if (NOT BUILD_SHARED_LIBS)
+   target_compile_definitions(espeak-ng INTERFACE "LIBESPEAK_NG_EXPORT=1")
+ endif()
+ 
+-set(espeakngdata_in "${CMAKE_INSTALL_PREFIX}/share/espeak-ng-data")
+-if (MINGW)
+-  include("${CMAKE_SOURCE_DIR}/cmake/msys2path.cmake")
+-  msys_to_windows("${espeakngdata_in}" espeakngdata)
+-  message(STATUS "Converted espeak-ng data path: ${espeakngdata}")
+-else ()
+-  set(espeakngdata "${espeakngdata_in}")
+-endif()
+-
+-target_compile_definitions(espeak-ng PRIVATE "PATH_ESPEAK_DATA=\"${espeakngdata}\"")
++target_compile_definitions(espeak-ng PRIVATE "PATH_ESPEAK_DATA=\"${CMAKE_INSTALL_PREFIX}/share/espeak-ng-data\"")
+ 
+ if (USE_ASYNC)
+   target_sources(espeak-ng PRIVATE
+diff --git a/src/libespeak-ng/speech.h b/src/libespeak-ng/speech.h
+index ee81d0526..97cd7dd2f 100644
+--- a/src/libespeak-ng/speech.h
++++ b/src/libespeak-ng/speech.h
+@@ -55,7 +55,12 @@ extern "C"
+ #if defined(_WIN32) || defined(_WIN64) // Windows
+ 
+ #define PLATFORM_WINDOWS 1
+-#define PATHSEP '\\'
++
++#ifdef __MINGW32__
++    #define PATHSEP '/'
++#else
++    #define PATHSEP '\\'
++#endif
+ #define N_PATH_HOME_DEF  230
+ #define NO_VARIADIC_MACROS
+ 
+diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
+index 756b24722..68c0ae37d 100644
+--- a/src/libespeak-ng/voices.c
++++ b/src/libespeak-ng/voices.c
+@@ -80,7 +80,7 @@ static const char variants_male[N_VOICE_VARIANTS] = { 1, 2, 3, 4, 5, 6, 0 };
+ static const char variants_female[N_VOICE_VARIANTS] = { 11, 12, 13, 14, 0 };
+ static const char *const variant_lists[3] = { variants_either, variants_male, variants_female };
+ 
+-#ifdef _WIN32
++#if !defined(__MINGW32__) && defined(_WIN32)
+ #define MB_PREFIX "mb\\"
+ #else
+ #define MB_PREFIX "mb/"

mingw-w64-espeak-ng/PKGBUILD

@@ -16,7 +16,7 @@ _commit=0d451f8c1c6ae837418b823bd9c4cbc574ea9ff5
 source=("git+https://github.com/espeak-ng/${_realname}#commit=${_commit}"
 		"MSYS2_MinGW64.patch")
 sha256sums=('c6956dc62d0441b27bc81a373dee60905d688c708373b41270f89dd33fea30c0'
-            '170e2b290ba2430f098270c13a41447056c09806c939e6d46c5f350f87cbf91a')
+            '4f4ae14a9242df6dd1ee685769b2970b8fde6f0570343c7017086209311a1856')
 
 pkgver() {
   cd "${srcdir}/${_realname}"