<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/655e164da81698aa96dd56d71b215d42261041bc">https://github.com/macports/macports-ports/commit/655e164da81698aa96dd56d71b215d42261041bc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 655e164da81698aa96dd56d71b215d42261041bc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 20 05:23:40 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> xine-ui: Fix crash on launch
</span>---
multimedia/xine-ui/Portfile | 3 ++-
multimedia/xine-ui/files/libcaca0.99.beta20.patch | 1 +
multimedia/xine-ui/files/malloc.patch | 1 +
multimedia/xine-ui/files/strlcpy.patch | 16 ++++++++++++++++
4 files changed, 20 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/Portfile b/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d83b2799b5a..6fa7bc41e83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name xine-ui
version 0.99.13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 d7bf046241a3fdf3c488e3644744798028a45d88 \
sha256 b2382d075c72b1b10039e0e90310cc86c8d910358c53559ed82d3d584201f5c5 \
size 2156892
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,7 @@ universal_variant no
</span> patchfiles globals.patch \
implicit.patch \
libcaca0.99.beta20.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcpy.patch \
</span> malloc.patch
configure.args --disable-lirc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/libcaca0.99.beta20.patch b/multimedia/xine-ui/files/libcaca0.99.beta20.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ded9a32d82..8fdba916d64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/libcaca0.99.beta20.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/files/libcaca0.99.beta20.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,6 @@
</span> Fix build with libcaca >= 0.99.beta20.
https://sourceforge.net/p/xine/mailman/message/37402888/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-ui/ci/42006da2b512315c16d1e55db60ac115f31dfc3e/
</span> --- src/aaui/main.c.orig 2021-12-12 13:49:29.000000000 -0600
+++ src/aaui/main.c 2021-12-17 00:36:53.000000000 -0600
@@ -69,6 +69,9 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/malloc.patch b/multimedia/xine-ui/files/malloc.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1121027b7ba..082e8187b1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/xine-ui/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/files/malloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,6 @@
</span> Remove malloc.h include since it is nonstandard and does not exist on macOS.
https://sourceforge.net/p/xine/mailman/message/37402874/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-ui/ci/3ea5f5a563782e4f2f5230e9d8e3a658229536a4/
</span> --- src/xitk/xine-toolkit/backend_x11.c.orig 2021-12-12 13:49:29.000000000 -0600
+++ src/xitk/xine-toolkit/backend_x11.c 2021-12-16 23:59:47.000000000 -0600
@@ -30,7 +30,6 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/xine-ui/files/strlcpy.patch b/multimedia/xine-ui/files/strlcpy.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..da70ee33fc0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/xine-ui/files/strlcpy.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix overlapping src and dst for strlcpy that caused crash on launch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/xine/xine-ui/ci/922dfad300c48592c23bffe647035a2a2b1c82b3/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/xitk/xine-toolkit/backend_x11.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/xitk/xine-toolkit/backend_x11.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2248,9 +2248,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *res_class = (const char *)win->props[XITK_X11_WT_RES_CLASS].value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *res_name = (const char *)win->props[XITK_X11_WT_RES_NAME].value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (res_class)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (res_class && res_class != win->res_class)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcpy (win->res_class, res_class, sizeof (win->res_class));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (res_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (res_name && res_name != win->res_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strlcpy (win->res_name, res_name, sizeof (win->res_name));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xclasshint->res_name = win->res_name[0] ? win->res_name : "Xine Window";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xclasshint->res_class = win->res_class[0] ? win->res_class : (char *)"Xitk";
</span></pre><pre style='margin:0'>
</pre>