<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56604b2fee680231b7a90954a830954a857c3c33">https://github.com/macports/macports-ports/commit/56604b2fee680231b7a90954a830954a857c3c33</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 56604b2fee6 dectalk: add GTK support
</span>56604b2fee6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 56604b2fee680231b7a90954a830954a857c3c33
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun May 26 02:37:17 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> dectalk: add GTK support
</span>---
audio/dectalk/Portfile | 34 ++-
audio/dectalk/files/patch-configure.diff | 14 +-
.../dectalk/files/patch-dapi-src-lts-lsw-main.diff | 47 ---
audio/dectalk/files/patch-fix-gspeak.diff | 334 +++++++++++++++++++++
audio/dectalk/files/patch-paths.diff | 177 +++++++++++
5 files changed, 541 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/Portfile b/audio/dectalk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e5274423f2..5a3e54171b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/dectalk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/dectalk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span>
github.setup dectalk dectalk 2023-10-30
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories audio
license Restrictive
maintainers {makr @mohd-akram} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,27 +18,30 @@ checksums rmd160 9909e84cd8f736584013e3307a102d5d9d3b2d3d \
</span> sha256 511c845e453917eea3a353cdbe8e0401360d8992dcfadfe2e9b4b83fde168f7e \
size 40565428
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s/\r//g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/dapi/src/lts/lsw_main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-dapi-src-lts-lsw-main.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xdg-open to open help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:xdg-utils
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc ${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=incompatible-function-pointer-types \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=implicit-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${distname}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-gspeak.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-paths.diff
</span>
post-destroot {
delete ${destroot}/usr/bin
delete ${destroot}${prefix}/src/DECtalk/gspeak
move ${destroot}${prefix}/say ${destroot}${prefix}/bin/dtsay
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/aclock ${destroot}${prefix}/dtmemory \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span> {*}[glob ${destroot}${prefix}/tools/*] \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/aclock \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/dtmemory \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/gspeak \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/windic \
</span> ${destroot}${prefix}/bin/
move {*}[glob ${destroot}${prefix}/doc/DECtalk/man/man1/*] \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +64,11 @@ post-destroot {
</span> move ${destroot}${prefix}/bitmaps ${destroot}${prefix}/dic \
${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # These don't work yet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/${name}/bitmaps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/share/man/man1/speak.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These aren't built
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete \
</span> ${destroot}${prefix}/share/man/man1/emacspeak.1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1/speak.1 \
</span> ${destroot}${prefix}/share/man/man1/windict.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete {*}[glob ${destroot}${prefix}/bin/tunecheck_*]
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/files/patch-configure.diff b/audio/dectalk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c1fa9da1ec6..4e2778519fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/dectalk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/dectalk/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix `#error Unsupported architecture` in headers of older SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix `#error Unsupported architecture` in headers of older SDKs and library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+path.
</span> --- configure.orig 2023-10-30 22:42:54
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-05-25 03:28:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-05-26 02:06:09
</span> @@ -3774,7 +3774,7 @@
return 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +20,12 @@ Fix `#error Unsupported architecture` in headers of older SDKs.
</span> then :
have_arch_arm64=yes
else $as_nop
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4075,7 +4075,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sparc-sun-*) DAPI_LD_SHARED="\$(LD) -G -Bsymbolic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -o \$@ \$(DECTALK_TTS_OBJS) \$(LIBS)" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-apple-darwin*) DAPI_LD_SHARED="\$(CC) -dynamic -dynamiclib -dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -o \$@ \$(DECTALK_TTS_OBJS) \$(LIBS) -Wl,-install_name,libtts_\$(LANG_CODE).so ${UNIVERSAL_BINARY}" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -o \$@ \$(DECTALK_TTS_OBJS) \$(LIBS) -Wl,-rpath,@loader_path/../lib/ -Wl,-install_name,@rpath/libtts_\$(LANG_CODE).so ${UNIVERSAL_BINARY}" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ML_ALL="../build/\$(OS_VERSION)/\$(LANG_CODE)/\$(ML_OUT)/libtts.a ../build/\$(OS_VERSION)/\$(LANG_CODE)/\$(ML_OUT)/libtts.so"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/files/patch-dapi-src-lts-lsw-main.diff b/audio/dectalk/files/patch-dapi-src-lts-lsw-main.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52e8372ac9f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/dectalk/files/patch-dapi-src-lts-lsw-main.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dapi/src/lts/lsw_main.c.orig 2024-05-25 02:25:40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dapi/src/lts/lsw_main.c 2024-05-25 02:28:47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1582,7 +1582,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (count != -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *cfg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1637,7 +1637,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,main_dict_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(main_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1673,7 +1673,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,DEF_LINUX_MAIN_DICT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(main_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1713,7 +1713,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,foreign_dict_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(foreign_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1749,7 +1749,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcat(dict,DEF_LINUX_FOREIGN_DICT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strcpy(foreign_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/files/patch-fix-gspeak.diff b/audio/dectalk/files/patch-fix-gspeak.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b198d8c68b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/dectalk/files/patch-fix-gspeak.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,334 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 5469ed473da309067a3f57cab6219ee2922665fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Mohamed Akram <mohd.akram@outlook.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun May 26 02:28:04 2024 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix building gspeak on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix some warnings that are errors on modern Clang, specifically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `incompatible-function-pointer-types`, `implicit-int` and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `implicit-function-declaration`. Also, ensure the build uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `libtts.dylib` on macOS and fix paths to resources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dapi/src/lts/l_gr_ru1.c dapi/src/lts/l_gr_ru1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f804deae..7af4c9d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dapi/src/lts/l_gr_ru1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dapi/src/lts/l_gr_ru1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAXBUCH 50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UMLMRK 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern ls_rule_show_phone(PHONE *, PHONE *, char *); // NAL warning removal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int ls_rule_show_phone(PHONE *, PHONE *, char *); // NAL warning removal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int ls_adju_is_cons(PHONE *); // NAL warning removal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dtalkml/src/dtalk_ml.c dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 08cf07aa..40b2c7e8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,7 +462,7 @@ unsigned int load_dectalk(char *lang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechOpenWaveOutFile = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechOpenWaveOutFile");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechCloseWaveOutFile = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechCloseWaveOutFile");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechGetStatus = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechGetStatus");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechReset = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechReset");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechReset = (MMRESULT ((_cdecl*)(LPTTS_HANDLE_T, BOOL))) GetProcAddress(funcs->mod,"TextToSpeechReset");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechSync = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechSync");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechGetRate = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechGetRate");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechSetRate = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechSetRate");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,10 +487,10 @@ unsigned int load_dectalk(char *lang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechVersion = (ULONG ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechVersion");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // CAB Removed warnings 6/24/02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechTyping = (VOID ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechTyping");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechTyping = (VOID ((_cdecl*)(LPTTS_HANDLE_T, unsigned char))) GetProcAddress(funcs->mod,"TextToSpeechTyping");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechGetLastError = (ULONG ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechGetLastError");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechReserved1 = (ULONG ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechReserved1");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechReserved1 = (ULONG ((_cdecl*)(unsigned char*, U8, BOOL, BOOL))) GetProcAddress(funcs->mod,"TextToSpeechReserved1");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // CAB Removed warnings 6/24/02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechReserved2 = (ULONG ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechReserved2");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,9 +504,9 @@ unsigned int load_dectalk(char *lang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechSetSpeakerParams = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechSetSpeakerParams");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // CAB Removed warnings 6/24/02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechDictionaryHit = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechDictionaryHit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechDictionaryHit = (int ((_cdecl*)(LPTTS_HANDLE_T, struct dic_entry *))) GetProcAddress(funcs->mod,"TextToSpeechDictionaryHit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechDumpDictionary = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechDumpDictionary");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechUserDictionaryHit = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechUserDictionaryHit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechUserDictionaryHit = (int ((_cdecl*)(LPTTS_HANDLE_T, struct dic_entry *))) GetProcAddress(funcs->mod,"TextToSpeechUserDictionaryHit");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechDumpUserDictionary = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechDumpUserDictionary");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechAddUserEntry = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechAddUserEntry");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechDeleteUserEntry = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechDeleteUserEntry");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -515,7 +515,7 @@ unsigned int load_dectalk(char *lang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechConvertToPhonemes = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechConvertToPhonemes");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* MGS added TextToSpeechTuning 12/03/1998 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechTuning = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechTuning");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- funcs->TextToSpeechGetPhVdefParams = (DWORD ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechGetPhVdefParams");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ funcs->TextToSpeechGetPhVdefParams = (short *((_cdecl*)(LPTTS_HANDLE_T, UINT))) GetProcAddress(funcs->mod,"TextToSpeechGetPhVdefParams");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechSetVolume = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechSetVolume");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ funcs->TextToSpeechGetVolume = (MMRESULT ((_cdecl*)())) GetProcAddress(funcs->mod,"TextToSpeechGetVolume");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/dtsamples/dtmemory.c samplosf/src/dtsamples/dtmemory.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 786ded94..f620ab03 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/dtsamples/dtmemory.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/dtsamples/dtmemory.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@ static void usage()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ** None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main( int argc, char *argv[] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main( int argc, char *argv[] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int devNo = (int)WAVE_MAPPER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int speaker_id = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/speak/Makefile.in samplosf/src/speak/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b3fdfdf..3fb114fe 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/speak/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/speak/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,7 @@ GSPEAK_ALL_OBJS= $(GSPEAK_OBJS) $(GSPEAK_DEMO_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #all: $(OUTPUT_DIR_2)/speak $(OUTPUT_DIR_2)/speak.uid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: $(SPEAK_ALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(OUTPUT_DIR_2)/gspeak:$(GSPEAK_OBJS) ../../../dtalkml/build/$(OS_VERSION)/$(LANG_CODE)/$(ML_OUT)/libtts.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(OUTPUT_DIR_2)/gspeak:$(GSPEAK_OBJS) ../../../dtalkml/build/$(OS_VERSION)/$(LANG_CODE)/$(ML_OUT)/$(ML_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -o $@ $(GSPEAK_OBJS) $(GLINK_FLAGS) $(G_DT_LIB) $(GLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@ $(OUTPUT_DIR_2)/link/gspeak.o:gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OUTPUT_DIR_2)/link/gspeakdem_$(LANG_CODE).o:gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -c -DDEMO -D$(LANGUAGE) $(GCFLAGS) -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(OUTPUT_DIR_2)/speak:$(SPEAK_OBJS) ../../../dtalkml/build/$(OS_VERSION)/$(LANG_CODE)/$(ML_OUT)/libtts.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(OUTPUT_DIR_2)/speak:$(SPEAK_OBJS) ../../../dtalkml/build/$(OS_VERSION)/$(LANG_CODE)/$(ML_OUT)/$(ML_SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RM) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -o $@ $(SPEAK_OBJS) $(LINKFLAGS) $(XLIBS) $(DT_LIB) $(LIBS) $(MMELIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/speak/gspeak.c samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4b1df83e..3adeb974 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,7 +762,18 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (config_file==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -779,7 +790,18 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (config_file==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -821,7 +843,18 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined __linux || defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (exe_path && (bitmap_path[0] != '/')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *bmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bmp = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1951,7 +1984,18 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (config_file==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1965,7 +2009,18 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (config_file==NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2006,7 +2061,18 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined __linux || defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((access(bitmap_path, R_OK) == -1) && (bitmap_path[0] != '/')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char p[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = readlink("/proc/self/exe", p, PATH_MAX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char ep[PATH_MAX] = {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t size = sizeof(ep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t count = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_NSGetExecutablePath(ep, &size) == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (realpath(ep, p) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ count = strlen(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *bmp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bmp = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/windict/compile_dict.c samplosf/src/windict/compile_dict.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c2e970e..e6052ac6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/windict/compile_dict.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/windict/compile_dict.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "port.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cmd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,6 +263,15 @@ void pushEntry();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char nonWhite();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char getAlpha();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int look_for_prefix(char, char);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int get_entry(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int parseString(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void scan_entry();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void sort_entry();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void scan_error(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int legal_alpha(char);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int validatePrefixStr(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int validatePostfixStr(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int skipBlanks(char*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,7 +314,7 @@ unsigned char case_upper[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-compile_dictonary(char *DictFile, char *text, char *errStr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void compile_dictonary(char *DictFile, char *text, char *errStr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char fnam_d[80];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,7 +402,7 @@ compile_dictonary(char *DictFile, char *text, char *errStr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sort_entry()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void sort_entry()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *ct,*dt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int *blink,next;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -438,7 +447,7 @@ sort_entry()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * <entry> {1 char phonemes}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-scan_entry()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void scan_entry()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -691,7 +700,7 @@ int lookupArpabet(p1,p2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * of the user dictionary ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-scan_error(es)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void scan_error(es)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *es;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,11 +734,11 @@ unsigned char getAlpha()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(line[curr_char] == ' ' || line[curr_char] == '\t')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(' ');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scan_error("Unknown alphabetic character");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return('\0');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char legal_graphs[] = "_-()&@*!\\/";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-legal_alpha(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int legal_alpha(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/windict/windic.c samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e2c325b0..4351e324 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,6 +94,7 @@ void Error(char*, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void CheckFileExtension(int, char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void SaveMsg(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *strip_filename(gchar *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void compile_dictonary(char *, char *, char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git udicunix/src/udic_com.c udicunix/src/udic_com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d890509f..01f9eaa5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- udicunix/src/udic_com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ udicunix/src/udic_com.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,7 +155,7 @@ unsigned int arpabet_lang_fonts[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int look_for_prefix(char p1, char p2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main(int argc,char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(int argc,char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined __linux__ || defined __osf__ || defined __ppc__ || defined (__APPLE__)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/files/patch-paths.diff b/audio/dectalk/files/patch-paths.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..07c5ca11aa7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/dectalk/files/patch-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,177 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dapi/src/lts/lsw_main.c dapi/src/lts/lsw_main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63257eb3..c12c3762 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dapi/src/lts/lsw_main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dapi/src/lts/lsw_main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1582,7 +1582,7 @@ int linux_get_dict_names(char *main_dict_name,char *user_dict_name, char *foreig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1637,7 +1637,7 @@ int linux_get_dict_names(char *main_dict_name,char *user_dict_name, char *foreig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,main_dict_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(main_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1673,7 +1673,7 @@ int linux_get_dict_names(char *main_dict_name,char *user_dict_name, char *foreig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,DEF_LINUX_MAIN_DICT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(main_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1713,7 +1713,7 @@ int linux_get_dict_names(char *main_dict_name,char *user_dict_name, char *foreig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,foreign_dict_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(foreign_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1749,7 +1749,7 @@ int linux_get_dict_names(char *main_dict_name,char *user_dict_name, char *foreig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(dict,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(dict,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(dict,DEF_LINUX_FOREIGN_DICT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(foreign_dict_name,dict);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dtalkml/src/dtalk_ml.c dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 40b2c7e8..8b7905e9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dtalkml/src/dtalk_ml.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,7 +619,7 @@ BOOL init(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1608,7 +1608,7 @@ DWORD TextToSpeechEnumLangs(LPLANG_ENUM *langs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/speak/gspeak.c samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4b1df83e..58610d85 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/speak/gspeak.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -783,7 +783,7 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -827,7 +827,7 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bmp = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(bmp,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(bmp,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,bitmap_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(bitmap_path,bmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1969,7 +1969,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2012,7 +2012,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bmp = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(bmp,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(bmp,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,bitmap_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(bitmap_path,bmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2093,7 +2093,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GSpeak help\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " Point your web browser to:\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " - file://" DECTALK_INSTALL_PREFIX "/doc/DECtalk/html/dectalk.htm\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ " - file://" DECTALK_INSTALL_PREFIX "/share/doc/dectalk/html/dectalk.htm\n\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " Or if you have xdg-open installed, click below.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_box_pack_start(GTK_BOX(help_vbox), help_label, FALSE, FALSE, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_label_set_justify(GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2118,7 +2118,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void HelpOpenNetscape()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system("xdg-open file://" DECTALK_INSTALL_PREFIX "/doc/DECtalk/html/dectalk.htm &");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system("xdg-open file://" DECTALK_INSTALL_PREFIX "/share/doc/dectalk/html/dectalk.htm &");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void NotAvailableCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git samplosf/src/windict/windic.c samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4351e324..dc227d6e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ samplosf/src/windict/windic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1122,14 +1122,14 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help_vbox = gtk_vbox_new(FALSE, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_container_add(GTK_CONTAINER(help_window), help_vbox);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_label = gtk_label_new("\nWindic help\n\n Point your web browser to:\n\n file:///usr/local/doc/DECtalk/html/DECtalk.html\n\n Or if you use Netscape, click below.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_label = gtk_label_new("\nWindic help\n\n Point your web browser to:\n\n file://" DECTALK_INSTALL_PREFIX "/share/doc/dectalk/html/dectalk.htm\n\n Or if you have xdg-open installed, click below.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_box_pack_start(GTK_BOX(help_vbox), help_label, FALSE, FALSE, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_label_set_justify(GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help_button_box = gtk_vbutton_box_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_box_pack_end(GTK_BOX(help_vbox), help_button_box, FALSE, FALSE, 20);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- help_button = gtk_button_new_with_label("Netscape users click here.");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ help_button = gtk_button_new_with_label("Open in web browser");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_signal_connect_object(GTK_OBJECT(help_button), "clicked",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTK_SIGNAL_FUNC(HelpOpenNetscape),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTK_OBJECT(help_window) );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1156,7 +1156,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ********************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void HelpOpenNetscape()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system("netscape file:///usr/local/doc/DECtalk/html/DECtalk.html &");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system("xdg-open file://" DECTALK_INSTALL_PREFIX "/share/doc/dectalk/html/dectalk.htm &");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*******************************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1232,7 +1232,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (count != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *cfg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(cfg,"/../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(cfg,"/../etc/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(cfg,"DECtalk.conf");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_file=fopen(cfg,"r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1276,7 +1276,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bmp = dirname(p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,"/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- strcat(bmp,"../");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strcat(bmp,"../share/dectalk/");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcat(bmp,bitmap_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(bitmap_path,bmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>