From 039f3f4c9fc5170a01f4ca280abbc7dac6af5f58 Mon Sep 17 00:00:00 2001
From: Sascha Cowley <16543535+SaschaCowley@users.noreply.github.com>
Date: Thu, 8 Aug 2024 17:17:27 +1000
Subject: [PATCH] Update eSpeak-NG to 1.54-dev commit 961454ff (#16976)

Closes #16775

Summary of the issue:
eSpeak needs to be updated for 2024.4.

Description of user facing changes
Added languages Faroese and Xextan to eSpeak-NG.

Description of development approach
Followed the update instructions.

Testing strategy:
Rebuilt NVDA from source. Ran NVDA, switched synth to eSpeak-NG. Tested that speech output worked fine in English. Switched voice to Faroese and Xextan and ensured that there was still output.

Known issues with pull request:
None.
---
 include/espeak                          |  2 +-
 nvdaHelper/espeak/sconscript            | 16 +++++++++++++++-
 projectDocs/dev/createDevEnvironment.md |  2 +-
 user_docs/en/changes.md                 |  2 ++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/include/espeak b/include/espeak
index 54ee11a79c6..961454ffaa8 160000
--- a/include/espeak
+++ b/include/espeak
@@ -1 +1 @@
-Subproject commit 54ee11a79c66c8ecb9a48a7084163beff3bd6075
+Subproject commit 961454ffaa894d981526f4d424daef1d3bc4175f
diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript
index dcdfcca6abf..886b51d1ccc 100644
--- a/nvdaHelper/espeak/sconscript
+++ b/nvdaHelper/espeak/sconscript
@@ -100,7 +100,7 @@ env.Append(
 		# Ignore all warnings as the code is not ours.
 		"/W0",
 		# Preprocessor definitions. Migrated from 'nvdaHelper/espeak/config.h'
-		'/DPACKAGE_VERSION=\\"1.52-dev 54ee11a7\\"',  # See 'include/espeak/src/windows/config.h'
+		'/DPACKAGE_VERSION=\\"1.52-dev 961454ff\\"',  # See 'include/espeak/src/windows/config.h'
 		"/DHAVE_STDINT_H=1",
 		"/D__WIN32__#1",
 		"/DLIBESPEAK_NG_EXPORT",
@@ -374,6 +374,13 @@ espeakDictionaryCompileList: typing.Dict[
 			"fi_rules",
 		],
 	),
+	"fo_dict": (
+		"fo",
+		[
+			"fo_list",
+			"fo_rules",
+		],
+	),
 	"fr_dict": (
 		"fr",
 		[
@@ -940,6 +947,13 @@ espeakDictionaryCompileList: typing.Dict[
 			"vi_rules",
 		],
 	),
+	"xex_dict": (
+		"xex",
+		[
+			"xex_list",
+			"xex_rules",
+		],
+	),
 	"yue_dict": ("yue", ["yue_list", "yue_listx", "yue_rules"]),
 }
 
diff --git a/projectDocs/dev/createDevEnvironment.md b/projectDocs/dev/createDevEnvironment.md
index ff1f5b67ddf..b68dc32365e 100644
--- a/projectDocs/dev/createDevEnvironment.md
+++ b/projectDocs/dev/createDevEnvironment.md
@@ -77,7 +77,7 @@ If you aren't sure, run `git submodule update` after every git pull, merge or ch
 
 For reference, the following run time dependencies are included in Git submodules:
 
-* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `54ee11a79c66c8ecb9a48a7084163beff3bd6075`
+* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `961454ffaa894d981526f4d424daef1d3bc4175f`
 * [Sonic](https://github.com/waywardgeek/sonic), commit `8694c596378c24e340c09ff2cd47c065494233f1`
 * [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit `3d8c7f0b833453f761ded6b12d8be431507bfe0b`
 * [liblouis](http://www.liblouis.io/), version 3.30.0
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
index c6f5a8ee947..eb318fa7f1e 100644
--- a/user_docs/en/changes.md
+++ b/user_docs/en/changes.md
@@ -21,6 +21,8 @@ The available options are:
 ### Changes
 
 * The `-c`/`--config-path` and `--disable-addons` command line options are now respected when launching an update from within NVDA. (#16937)
+* eSpeak NG has been updated to 1.52-dev commit `961454ff`. (#16775)
+  * Added new languages Faroese and Xextan.
 
 ### Bug Fixes