From babdc53c5040a0d8e35f170f7773fcd02c8a4a76 Mon Sep 17 00:00:00 2001 From: Leonard de Ruijter Date: Wed, 28 Aug 2019 11:14:54 +0200 Subject: [PATCH 1/2] Revert "Update liblouis to version 3.10 (#9678)" This reverts commit d5ed95ce01d3d1d79a0367b2cded83cfd1527df8. --- include/liblouis | 2 +- nvdaHelper/espeak/sconscript | 2 +- nvdaHelper/liblouis/sconscript | 3 --- readme.md | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/liblouis b/include/liblouis index cc834a39b28..1362d1b54b0 160000 --- a/include/liblouis +++ b/include/liblouis @@ -1 +1 @@ -Subproject commit cc834a39b28b22242d8546417afa1fda5a39440b +Subproject commit 1362d1b54b01f6637c25442226641a7c4c708d73 diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript index f01d64ab2ff..afaf2e093d5 100644 --- a/nvdaHelper/espeak/sconscript +++ b/nvdaHelper/espeak/sconscript @@ -40,7 +40,7 @@ if 'analyze' in env['nvdaHelperDebugFlags']: env.Append(CCFLAGS='/analyze-') # Ignore all warnings as the code is not ours -env.Replace(CCFLAGS='/W0') +env.Append(CCFLAGS='/W0') env.Append(CPPPATH=['#nvdaHelper/espeak',espeakIncludeDir,espeakIncludeDir.Dir('compat'),sonicSrcDir,espeakSrcDir.Dir('ucd-tools/src/include')]) diff --git a/nvdaHelper/liblouis/sconscript b/nvdaHelper/liblouis/sconscript index 21c81437efd..95890de960c 100644 --- a/nvdaHelper/liblouis/sconscript +++ b/nvdaHelper/liblouis/sconscript @@ -41,9 +41,6 @@ env = env.Clone() if 'analyze' in env['nvdaHelperDebugFlags']: env.Append(CCFLAGS='/analyze-') -# Ignore some warnings as the code is not ours -env.Replace(CCFLAGS='/W2') - env.Append(CPPDEFINES=[ # The Visual C++ C Runtime deprecates several standard library functions in # preference for _s variants that are specific to Visual C++. This removes diff --git a/readme.md b/readme.md index 22d9ff9242b..f0e3a644d10 100644 --- a/readme.md +++ b/readme.md @@ -67,7 +67,7 @@ For reference, the following dependencies are included in Git submodules: * [Sonic](https://github.com/waywardgeek/sonic), commit 4f8c1d11 * [IAccessible2](http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2), commit 21bbb176 * [ConfigObj](https://github.com/DiffSK/configobj), commit 5b5de48 -* [liblouis](http://www.liblouis.org/), version 3.10.0 +* [liblouis](http://www.liblouis.org/), version 3.9.0 * [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) Emoji Annotations, version 35.0 * NVDA images and sounds * System dlls not present on many systems: mfc90.dll, msvcp90.dll, msvcr90.dll, Microsoft.VC90.CRT.manifest From a4a3e1e624675d23e32e476ae01424c1cbd77947 Mon Sep 17 00:00:00 2001 From: Leonard de Ruijter Date: Tue, 17 Sep 2019 07:45:32 +0200 Subject: [PATCH 2/2] DO not touch espeak sconscript --- nvdaHelper/espeak/sconscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript index afaf2e093d5..f01d64ab2ff 100644 --- a/nvdaHelper/espeak/sconscript +++ b/nvdaHelper/espeak/sconscript @@ -40,7 +40,7 @@ if 'analyze' in env['nvdaHelperDebugFlags']: env.Append(CCFLAGS='/analyze-') # Ignore all warnings as the code is not ours -env.Append(CCFLAGS='/W0') +env.Replace(CCFLAGS='/W0') env.Append(CPPPATH=['#nvdaHelper/espeak',espeakIncludeDir,espeakIncludeDir.Dir('compat'),sonicSrcDir,espeakSrcDir.Dir('ucd-tools/src/include')])