<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/84e6398aab394cddb9439f99b42c0e0844ea0c6c">https://github.com/macports/macports-ports/commit/84e6398aab394cddb9439f99b42c0e0844ea0c6c</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 84e6398 cuneiform: Fix ordered comparison between pointer and zero
</span>84e6398 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84e6398aab394cddb9439f99b42c0e0844ea0c6c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 17 09:26:01 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> cuneiform: Fix ordered comparison between pointer and zero
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56824
</span>---
textproc/cuneiform/Portfile | 1 +
..._src-Kern-ced-sources-main-ced_func_rtf.cpp.diff | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/Portfile b/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9abe00..6641979a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,7 @@ platform darwin powerpc {
</span> patch-CMakeLists.txt.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff
</span> patchfiles-append patch-cuneiform_src-Kern-leo-src-leo_dll.c.diff
cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/cuneiform/files/patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff b/textproc/cuneiform/files/patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..479ce35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/cuneiform/files/patch-cuneiform_src-Kern-ced-sources-main-ced_func_rtf.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: ordered comparison between pointer and zero"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 2011-04-19 07:49:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp 2018-07-17 09:18:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,7 +212,7 @@
</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;'>+ // write the text lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (;sect>0;sect=sect->next)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (;sect!=NULL;sect=sect->next)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // int sectNum=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -897,7 +897,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // extract value for comparison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (prevChar>0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (prevChar!=NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PrevStyle=prevChar->fontAttribs;
</span></pre><pre style='margin:0'>
</pre>