<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d3f7d47d52ac7d28b749d4e343b387a95099e13">https://github.com/macports/macports-ports/commit/9d3f7d47d52ac7d28b749d4e343b387a95099e13</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 9d3f7d47d52 tix: prefer upstream approach in patch
</span>9d3f7d47d52 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d3f7d47d52ac7d28b749d4e343b387a95099e13
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Aug 30 14:17:04 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> tix: prefer upstream approach in patch
</span>---
x11/tix/files/patch-generic-tixGrSort.c.diff | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/files/patch-generic-tixGrSort.c.diff b/x11/tix/files/patch-generic-tixGrSort.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 701267ef4bf..8f3bd94ba6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/files/patch-generic-tixGrSort.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tix/files/patch-generic-tixGrSort.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- generic/tixGrSort.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/generic/tixGrSort.c b/generic/tixGrSort.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7dee30f..26ec054 100644
</span> --- generic/tixGrSort.c
+++ generic/tixGrSort.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -447,8 +447,8 @@ SortCompareProc(first, second)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,6 +426,7 @@ SortCompareProc(first, second)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int oldLength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *result;
</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;'>+ * Generate and evaluate a command to determine which string comes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -447,8 +448,9 @@ SortCompareProc(first, second)
</span> * Parse the result of the command.
*/
- order = strtol(sortInterp->result, &end, 0);
- if ((end == sortInterp->result) || (*end != 0)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ order = strtol(Tcl_GetStringResult(sortInterp), &end, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((end == Tcl_GetStringResult(sortInterp)) || (*end != 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = Tcl_GetStringResult(sortInterp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ order = strtol(result, &end, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((end == result) || (*end != 0)) {
</span> Tcl_ResetResult(sortInterp);
Tcl_AppendResult(sortInterp,
"comparison command returned non-numeric result",
</pre><pre style='margin:0'>
</pre>