Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 13:02:34 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r433030 - in branches/2017Q1/textproc/htmldoc: . files
Message-ID:  <201702011302.v11D2Yvn081666@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Feb  1 13:02:33 2017
New Revision: 433030
URL: https://svnweb.freebsd.org/changeset/ports/433030

Log:
  MFH: r432965
  
  textproc/htmldoc: unbreak with clang 4.0
  
  htmlsep.cxx:527:19: error: ordered comparison between pointer and zero ('int *' and 'int')
        if (heading >= 0)
            ~~~~~~~ ^  ~
  
  PR:		216159
  Reported by:	antoine (via exp-run)
  Approved by:	portmgr blanket
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q1/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx
     - copied unchanged from r432965, head/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx
Modified:
  branches/2017Q1/textproc/htmldoc/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/textproc/htmldoc/Makefile
==============================================================================
--- branches/2017Q1/textproc/htmldoc/Makefile	Wed Feb  1 13:00:03 2017	(r433029)
+++ branches/2017Q1/textproc/htmldoc/Makefile	Wed Feb  1 13:02:33 2017	(r433030)
@@ -3,7 +3,7 @@
 
 PORTNAME=	htmldoc
 PORTVERSION=	1.8.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.msweet.org/files/project1/ \
 		EASYSW/${PORTNAME}/${PORTVERSION}

Copied: branches/2017Q1/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx (from r432965, head/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx	Wed Feb  1 13:02:33 2017	(r433030, copy of r432965, head/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx)
@@ -0,0 +1,11 @@
+--- htmldoc/htmlsep.cxx.orig	2013-08-09 13:43:34 UTC
++++ htmldoc/htmlsep.cxx
+@@ -524,7 +524,7 @@ write_doc(FILE   **out,			// I - Output 
+     if (t->markup >= MARKUP_H1 && t->markup < (MARKUP_H1 + TocLevels) &&
+         htmlGetVariable(t, (uchar *)"_HD_OMIT_TOC") == NULL)
+     {
+-      if (heading >= 0)
++      if (*heading >= 0)
+         write_footer(out, *heading);
+ 
+       (*heading) ++;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702011302.v11D2Yvn081666>