From ae24b531f5f1740fcf770a541dab841bf9be191d Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 20 Oct 2023 21:27:44 -0400 Subject: even more whacky bs --- www-client/chromium/Manifest | 2 +- .../files/chromium-120-speech-dispatcher-include.h | 104 ++++++++++++++++++++- 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index b51ff25..a7a9079 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -27,7 +27,7 @@ AUX chromium-119-minizip.patch 6867 BLAKE2B 50dcf02d6095fc75c2033afba39bae6386e4 AUX chromium-119-paint-fragment-data-iterator-nullptr.patch 1017 BLAKE2B f1038cf6a485fcab0ec19449e1fb9f07a151928080db0caac4628aab03b9e526e9a6d58ee23c299d92e55c76649e81ea79710cb44eaadd9f31f9f07e01f377aa SHA512 8c9bfd61e7c04be3f105f1c27cc3a6b68454711d5b61a821d7467bad8b5420e94905d1f39f273f1e78c78c9aea5e13ac7a3d5f7489bb78f3856eac00b77171d4 AUX chromium-120-compiler.patch 9228 BLAKE2B ccfe733c7528a0371d7cb6765e89567b6bfb0c2c2011df638e8fd0f17e9fc3b89da6bfebb2d53f81ba9130596910e276189cdb8d7ad6d950f7d78b87137fca81 SHA512 e800a6f981a03741c7b1f434f308c3d18bdd3022000a28513ad0e16d30c9424f5f15ba7b86fbc6bf35330dc083501d0be3dca84aef25e90d02e1571ab6ed5ac4 AUX chromium-120-safe_sprintf-nullptr-t.patch 1166 BLAKE2B f21d4b56f7b8fa33e88a6f70204a9d4ac79977addc41fcab919090f059be8e24dc13074236d1973c9f6cd17419e023d7b18c6f4bae23026062125ff3bf3c6fa4 SHA512 4f33f36293e07b809da36873d960066e03f2ab3960a50b5a797df9d0648a4c975d5535238602819ab4e21fc16bb67da4b8a79dfdcb66fc46090a4b1dff0f1fc4 -AUX chromium-120-speech-dispatcher-include.h 379 BLAKE2B dd198c946dd180cf937ecfa92ba6ba920a421743c3ad43cad2ebe6cec8862a7b25771c4532a37ab279c7129ad81253c37981a1bb1458cbaaa7b986d2ec1f71ed SHA512 e1bc2cefe05841f66c5f32a42123ae91c8b596d36c262c16d44657db83f8c088ac167b56ad5f3be6247944086776d99cecf07fbbce046facdeb97d4e7ac4bc4a +AUX chromium-120-speech-dispatcher-include.h 2233 BLAKE2B df78a67015752df51d8b851a83d810b252d5c9903aade30b5985411ffc38fbe772fd1e1a6e88a4df57aa81c87d9bb3e0fb440454f0351ddf974cc3b71e7fccdc SHA512 eadd8e2dc4d9f567dca2cd9b4da31f1976b3137e27fe191388531994187fa81cc6c50607a1334f9defd7a26b4f2d4995180e204dd4b6550d5d03b0bd8b89ae0d AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6 diff --git a/www-client/chromium/files/chromium-120-speech-dispatcher-include.h b/www-client/chromium/files/chromium-120-speech-dispatcher-include.h index c0a5b96..7e589f6 100644 --- a/www-client/chromium/files/chromium-120-speech-dispatcher-include.h +++ b/www-client/chromium/files/chromium-120-speech-dispatcher-include.h @@ -1,12 +1,110 @@ diff --git a/third_party/speech-dispatcher/libspeechd.h b/third_party/speech-dispatcher/libspeechd.h -index b68382ec97..655f911374 100644 +index b68382ec97..26c14fb33c 100644 --- a/third_party/speech-dispatcher/libspeechd.h +++ b/third_party/speech-dispatcher/libspeechd.h -@@ -27,7 +27,6 @@ +@@ -27,8 +27,103 @@ #include #include -#include "libspeechd_version.h" - #include "speechd_types.h" +-#include "speechd_types.h" ++typedef enum { ++ SPD_PUNCT_ALL = 0, ++ SPD_PUNCT_NONE = 1, ++ SPD_PUNCT_SOME = 2, ++ SPD_PUNCT_MOST = 3 ++} SPDPunctuation; ++ ++typedef enum { ++ SPD_CAP_NONE = 0, ++ SPD_CAP_SPELL = 1, ++ SPD_CAP_ICON = 2 ++} SPDCapitalLetters; ++ ++typedef enum { ++ SPD_SPELL_OFF = 0, ++ SPD_SPELL_ON = 1 ++} SPDSpelling; ++ ++typedef enum { ++ SPD_MALE1 = 1, ++ SPD_MALE2 = 2, ++ SPD_MALE3 = 3, ++ SPD_FEMALE1 = 4, ++ SPD_FEMALE2 = 5, ++ SPD_FEMALE3 = 6, ++ SPD_CHILD_MALE = 7, ++ SPD_CHILD_FEMALE = 8, ++ SPD_UNSPECIFIED = -1 ++} SPDVoiceType; ++ ++typedef struct { ++ char *name; /* Name of the voice (id) */ ++ char *language; /* 2/3-letter ISO language code, ++ * possibly followed by 2/3-letter ISO region code, ++ * e.g. en-US */ ++ char *variant; /* a not-well defined string describing dialect etc. */ ++} SPDVoice; ++ ++typedef enum { ++ SPD_DATA_TEXT = 0, ++ SPD_DATA_SSML = 1 ++} SPDDataMode; ++ ++typedef enum { ++ SPD_IMPORTANT = 1, ++ SPD_MESSAGE = 2, ++ SPD_TEXT = 3, ++ SPD_NOTIFICATION = 4, ++ SPD_PROGRESS = 5 ++} SPDPriority; ++ ++typedef enum { ++ SPD_BEGIN = 1, ++ SPD_END = 2, ++ SPD_INDEX_MARKS = 4, ++ SPD_CANCEL = 8, ++ SPD_PAUSE = 16, ++ SPD_RESUME = 32, ++ ++ SPD_ALL = 0x3f ++} SPDNotification; ++ ++typedef enum { ++ SPD_EVENT_BEGIN, ++ SPD_EVENT_END, ++ SPD_EVENT_INDEX_MARK, ++ SPD_EVENT_CANCEL, ++ SPD_EVENT_PAUSE, ++ SPD_EVENT_RESUME ++} SPDNotificationType; ++ ++typedef enum { ++ SORT_BY_TIME = 0, ++ SORT_BY_ALPHABET = 1 ++} ESort; ++ ++typedef enum { ++ SPD_MSGTYPE_TEXT = 0, ++ SPD_MSGTYPE_SOUND_ICON = 1, ++ SPD_MSGTYPE_CHAR = 2, ++ SPD_MSGTYPE_KEY = 3, ++ SPD_MSGTYPE_SPELL = 99 ++} SPDMessageType; ++ ++typedef struct { ++ signed int rate; ++ signed int pitch; ++ signed int pitch_range; ++ signed int volume; ++ ++ SPDPunctuation punctuation_mode; ++ SPDSpelling spelling_mode; ++ SPDCapitalLetters cap_let_recogn; ++ ++ SPDVoiceType voice_type; ++ SPDVoice voice; ++} SPDMsgSettings; /* *INDENT-OFF* */ + #ifdef __cplusplus -- cgit v1.2.3