From owner-svn-ports-all@freebsd.org Sun Mar 11 21:35:12 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9422F51239; Sun, 11 Mar 2018 21:35:12 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 57E4E80B19; Sun, 11 Mar 2018 21:35:12 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52CB522B3D; Sun, 11 Mar 2018 21:35:12 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2BLZCJn009154; Sun, 11 Mar 2018 21:35:12 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2BLZCBG009153; Sun, 11 Mar 2018 21:35:12 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201803112135.w2BLZCBG009153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 11 Mar 2018 21:35:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464212 - head/graphics/cuneiform/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/graphics/cuneiform/files X-SVN-Commit-Revision: 464212 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Mar 2018 21:35:12 -0000 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;