svn commit: r464212 - head/graphics/cuneiform/files

[Adriaan de Groot]

Author: adridg
Date: Sun Mar 11 21:35:11 2018
New Revision: 464212
URL: https://svnweb.freebsd.org/changeset/ports/464212

Log:
  Fix build with base Clang on 11.1 -- this probably does not cover all of the
  problems listed in the PR, but it's a step. The port remains unmaintained,
  upstream hasn't been maintained in ~8 years, should probably be deprecated instead.
  
  PR:		216197
  Approved by:	tcberner (mentor, implicit)

Added:
  head/graphics/cuneiform/files/patch-cuneiform__src_Kern_ced_sources_main_ced__func__rtf.cpp   (contents, props changed)

Added: head/graphics/cuneiform/files/patch-cuneiform__src_Kern_ced_sources_main_ced__func__rtf.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/cuneiform/files/patch-cuneiform__src_Kern_ced_sources_main_ced__func__rtf.cpp	Sun Mar 11 21:35:11 2018	(r464212)
@@ -0,0 +1,25 @@
+Fix with modern Clang, e.g.
+
+cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp:215:12: error: ordered comparison between pointer and zero ('CEDSection *' and 'int')
+        for (;sect>0;sect=sect->next)
+
+--- cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig	2018-03-11 17:08:11 UTC
++++ cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp
+@@ -212,7 +212,7 @@ Bool32	CEDPage::FormattedWriteRtf(const 
+     }
+ */
+     // write the text lines
+-	for (;sect>0;sect=sect->next)
++	for (;sect;sect=sect->next)
+ 	{
+ 		if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
+ 		//	int sectNum=0;
+@@ -897,7 +897,7 @@ Bool WriteRtfCharFmt(struct StrRtfOut fa
+ //    if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
+ 
+     // extract value for comparison
+-    if (prevChar>0) {
++    if (prevChar) {
+ //       lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+        PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+        PrevStyle=prevChar->fontAttribs;