<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/3c02852aa3ef249ba8d7e897fbbb6e5f24354b6e">https://github.com/macports/macports-ports/commit/3c02852aa3ef249ba8d7e897fbbb6e5f24354b6e</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 3c02852aa3e dectalk: fix windic images
</span>3c02852aa3e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c02852aa3ef249ba8d7e897fbbb6e5f24354b6e
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun May 26 03:15:33 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> dectalk: fix windic images
</span>---
audio/dectalk/Portfile | 3 +-
audio/dectalk/files/patch-fix-windic.diff | 71 +++++++++++++++++++++++++++++++
audio/dectalk/files/patch-paths.diff | 20 ++++-----
3 files changed, 83 insertions(+), 11 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 5a3e54171b3..46db03681fb 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 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories audio
license Restrictive
maintainers {makr @mohd-akram} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,7 @@ worksrcdir ${distname}/src
</span>
patchfiles patch-configure.diff \
patch-fix-gspeak.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-windic.diff \
</span> patch-paths.diff
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/dectalk/files/patch-fix-windic.diff b/audio/dectalk/files/patch-fix-windic.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f4773c79178
</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-windic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit abd064c9c9ec654e8a74d86475f596f9696309e6
</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:50:08 2024 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix Windic resource paths on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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..1c721acd 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;'>+@@ -1210,7 +1210,19 @@ 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;'>++
</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;'>+@@ -1227,7 +1239,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;'>+@@ -1269,7 +1292,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 (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;color:#808080;'>diff --git a/audio/dectalk/files/patch-paths.diff b/audio/dectalk/files/patch-paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 07c5ca11aa7..291a7fa02bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/dectalk/files/patch-paths.diff
</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;'>@@ -70,10 +70,10 @@ index 40b2c7e8..8b7905e9 100644
</span> config_file=fopen(cfg,"r");
}
diff --git samplosf/src/speak/gspeak.c samplosf/src/speak/gspeak.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4b1df83e..58610d85 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3adeb974..57993f84 100644
</span> --- samplosf/src/speak/gspeak.c
+++ samplosf/src/speak/gspeak.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -783,7 +783,7 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -805,7 +805,7 @@ int main (int argc, char *argv[])
</span> if (count != -1) {
char *cfg;
cfg = dirname(p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ index 4b1df83e..58610d85 100644
</span> strcat(cfg,"DECtalk.conf");
config_file=fopen(cfg,"r");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -827,7 +827,7 @@ int main (int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -860,7 +860,7 @@ int main (int argc, char *argv[])
</span> bmp = dirname(p);
strcat(bmp,"/");
if (parent)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@ index 4b1df83e..58610d85 100644
</span> strcat(bmp,bitmap_path);
strcpy(bitmap_path,bmp);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1969,7 +1969,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2024,7 +2024,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span> if (count != -1) {
char *cfg;
cfg = dirname(p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ index 4b1df83e..58610d85 100644
</span> strcat(cfg,"DECtalk.conf");
config_file=fopen(cfg,"r");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2012,7 +2012,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2078,7 +2078,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span> bmp = dirname(p);
strcat(bmp,"/");
if (parent)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ index 4b1df83e..58610d85 100644
</span> strcat(bmp,bitmap_path);
strcpy(bitmap_path,bmp);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2093,7 +2093,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2159,7 +2159,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span> "\n"
"GSpeak help\n\n"
" Point your web browser to:\n\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ index 4b1df83e..58610d85 100644
</span> " Or if you have xdg-open installed, click below.\n");
gtk_box_pack_start(GTK_BOX(help_vbox), help_label, FALSE, FALSE, 0);
gtk_label_set_justify(GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2118,7 +2118,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2184,7 +2184,7 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
</span>
void HelpOpenNetscape()
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@ index 4b1df83e..58610d85 100644
</span>
void NotAvailableCallback(GtkWidget *w, gpointer data)
diff --git samplosf/src/windict/windic.c samplosf/src/windict/windic.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4351e324..dc227d6e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c8fa1b13..c26a15f8 100644
</span> --- samplosf/src/windict/windic.c
+++ samplosf/src/windict/windic.c
@@ -1122,14 +1122,14 @@ void HelpHelpCallback(GtkWidget *w, gpointer data)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,7 @@ index 4351e324..dc227d6e 100644
</span> }
/*******************************************************************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1232,7 +1232,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1255,7 +1255,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span> if (count != -1) {
char *cfg;
cfg = dirname(p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,7 +166,7 @@ index 4351e324..dc227d6e 100644
</span> strcat(cfg,"DECtalk.conf");
config_file=fopen(cfg,"r");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1276,7 +1276,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1310,7 +1310,7 @@ void HelpAboutCallback(GtkWidget *w, gpointer data)
</span> bmp = dirname(p);
strcat(bmp,"/");
if (parent)
</pre><pre style='margin:0'>
</pre>