Skip to content

Downgrade espeak to aafd2e720#12495

Merged
feerrenrut merged 6 commits into
betafrom
downgradeEspeak
Jun 2, 2021
Merged

Downgrade espeak to aafd2e720#12495
feerrenrut merged 6 commits into
betafrom
downgradeEspeak

Conversation

@seanbudd

@seanbudd seanbudd commented Jun 1, 2021

Copy link
Copy Markdown
Member

Link to issue number:

Closes #12465

Summary of the issue:

The latest espeak, used in beta, has a blocking issue. As such, we are reverting to the last known stable espeak.

Description of how this pull request fixes the issue:

Reverts to espeak in release 2020.4 which is aafd2e720.

The strategy to updating was to follow the updating espeak readme.

Choosing the commit:

git diff master release-2020.4 include/espeak
diff --git a/include/espeak b/include/espeak
index f6d092a9c..aafd2e720 160000
--- a/include/espeak
+++ b/include/espeak
@@ -1 +1 @@
-Subproject commit f6d092a9c13d864ede78c493f64a7d32cde41f09
+Subproject commit aafd2e720582d7ccdadef675ce656903bc775c1d

And then applying the results of git diff f6d092a9c13d864ede78c493f64a7d32cde41f09 aafd2e720582d7ccdadef675ce656903bc775c1d Makefile.am within the espeak project.

Testing strategy:

NVDA builds, ensure espeak continues to work as expected like 2020.4.

Known issues with pull request:

None

Change log entries:

Changes: remove mention of update to espeak.

Note: 2020.4 didn't mention the upgrade to espeak. As such, those using the changelog to figure out the latest espeak version may be misled.

Code Review Checklist:

  • Pull Request description is up to date.
  • Unit tests.
  • System (end to end) tests.
  • Manual testing.
  • User Documentation.
  • Change log entry.
  • Context sensitive help for GUI changes.
  • UX of all users considered:
    • Speech
    • Braille
    • Low Vision
    • Different web browsers

@seanbudd seanbudd added this to the 2021.1 milestone Jun 1, 2021
@seanbudd seanbudd requested a review from a team as a code owner June 1, 2021 07:06
@seanbudd seanbudd requested review from michaelDCurran and removed request for a team June 1, 2021 07:06
@AppVeyorBot

Copy link
Copy Markdown

@feerrenrut

Copy link
Copy Markdown
Contributor

For reference, information about Chinese dictionary compilation: espeak-ng/espeak-ng#933

@CyrilleB79 CyrilleB79 mentioned this pull request Jun 1, 2021
8 tasks
@LeonarddeR

Copy link
Copy Markdown
Collaborator

How about the references to speech player?

@Brian1Gaff

Brian1Gaff commented Jun 1, 2021 via email

Copy link
Copy Markdown

@seanbudd

seanbudd commented Jun 2, 2021

Copy link
Copy Markdown
Member Author

How about the references to speech player?

Which references? If you mean within the sconscript, these should just reflect undoing changes to the espeak Makefile since 2020.4.

@LeonarddeR

Copy link
Copy Markdown
Collaborator

Ah, thanks for clarifying. I wasn't aware speech player was merged in espeak upstream.

@seanbudd seanbudd requested a review from feerrenrut June 2, 2021 08:09
@feerrenrut

Copy link
Copy Markdown
Contributor

This is weird, the appveyor build has completed and succeeded, but GitHub still shows it as pending. I'm going to go ahead and merge this.

@feerrenrut feerrenrut merged commit 007f580 into beta Jun 2, 2021
@feerrenrut feerrenrut deleted the downgradeEspeak branch June 2, 2021 11:57
seanbudd added a commit that referenced this pull request Jun 21, 2021
@seanbudd seanbudd mentioned this pull request Jun 21, 2021
8 tasks
seanbudd added a commit that referenced this pull request Jun 22, 2021
* Revert "Downgrade espeak to aafd2e720 (PR #12495)"

This reverts commit 007f580.

* update espeak to ab11439b18238b7a08b965d1d5a6ef31cbb05cbb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants