Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 1 Feb 2017 05:28:00 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432981 - in head/graphics/swfmill: . files
Message-ID:  <201702010528.v115S0HU088336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Wed Feb  1 05:28:00 2017
New Revision: 432981
URL: https://svnweb.freebsd.org/changeset/ports/432981

Log:
  graphics/swfmill: unbreak with clang 4.0
  
  gSWFParseXML.cpp:19:10: error: ordered comparison between pointer and zero ('iconv_t'
        (aka '__tag_iconv_t *') and 'int')
                  if (cd < 0) {
                      ~~ ^ ~
  gSWFWriteXML.cpp:15:10: error: ordered comparison between pointer and zero ('iconv_t'
        (aka '__tag_iconv_t *') and 'int')
                  if (cd < 0) {
                      ~~ ^ ~
  
  Reported by:	antoine (via exp-run)

Added:
  head/graphics/swfmill/files/patch-src_codegen_parsexml.xsl   (contents, props changed)
  head/graphics/swfmill/files/patch-src_codegen_writexml.xsl   (contents, props changed)
Modified:
  head/graphics/swfmill/Makefile   (contents, props changed)

Modified: head/graphics/swfmill/Makefile
==============================================================================
--- head/graphics/swfmill/Makefile	Wed Feb  1 05:27:46 2017	(r432980)
+++ head/graphics/swfmill/Makefile	Wed Feb  1 05:28:00 2017	(r432981)
@@ -3,7 +3,7 @@
 
 PORTNAME=	swfmill
 PORTVERSION=	0.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://swfmill.org/releases/
 

Added: head/graphics/swfmill/files/patch-src_codegen_parsexml.xsl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/swfmill/files/patch-src_codegen_parsexml.xsl	Wed Feb  1 05:28:00 2017	(r432981)
@@ -0,0 +1,11 @@
+--- src/codegen/parsexml.xsl.orig	2013-10-30 17:33:35 UTC
++++ src/codegen/parsexml.xsl
+@@ -19,7 +19,7 @@ char *fromXmlChar(const Context *ctx, co
+ 	if (ctx-&gt;convertEncoding) {
+ 		size_t len = strlen((const char *)from_str);
+ 		iconv_t cd = iconv_open(ctx-&gt;swf_encoding, "UTF-8");
+-		if (cd &lt; 0) {
++		if (cd == NULL) {
+ 			fprintf(stderr, "iconv_open failed.\n");
+ 			char *buf = new char[1];
+ 			buf[0] = '\0';

Added: head/graphics/swfmill/files/patch-src_codegen_writexml.xsl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/swfmill/files/patch-src_codegen_writexml.xsl	Wed Feb  1 05:28:00 2017	(r432981)
@@ -0,0 +1,11 @@
+--- src/codegen/writexml.xsl.orig	2013-10-30 17:33:35 UTC
++++ src/codegen/writexml.xsl
+@@ -15,7 +15,7 @@ xmlChar *toXmlChar(const Context *ctx, c
+ 	if (ctx-&gt;convertEncoding) {
+ 		size_t len = strlen(from_str);
+ 		iconv_t cd = iconv_open("UTF-8", ctx-&gt;swf_encoding);
+-		if (cd &lt; 0) {
++		if (cd == NULL) {
+ 			fprintf(stderr, "iconv_open failed.\n");
+ 			return xmlCharStrdup("");
+ 		}

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