From owner-svn-ports-all@freebsd.org Sat Jan 21 03:25:48 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E700CBAFA8; Sat, 21 Jan 2017 03:25:48 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 343951CCB; Sat, 21 Jan 2017 03:25:48 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0L3PljJ095710; Sat, 21 Jan 2017 03:25:47 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0L3PlpK095709; Sat, 21 Jan 2017 03:25:47 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701210325.v0L3PlpK095709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 21 Jan 2017 03:25:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432010 - branches/2017Q1/converters/wkhtmltopdf/files X-SVN-Group: ports-branches 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.23 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: Sat, 21 Jan 2017 03:25:48 -0000 Author: jbeich Date: Sat Jan 21 03:25:47 2017 New Revision: 432010 URL: https://svnweb.freebsd.org/changeset/ports/432010 Log: MFH: r432009 converters/wkhtmltopdf: unbreak with clang 4.0 (same as r431742) src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp:77:24: error: ordered comparison between pointer and zero ('const int *' and 'int') if (optionalHeight > 0) ~~~~~~~~~~~~~~ ^ ~ PR: 216211 Obtained from: upstream (excerpt) Approved by: portmgr blanket Approved by: ports-secteam blanket Added: branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp - copied unchanged from r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp (from r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp Sat Jan 21 03:25:47 2017 (r432010, copy of r432009, head/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) @@ -0,0 +1,21 @@ +------------------------------------------------------------------------ +r113848 | abecsi@webkit.org | 2012-04-11 11:23:19 +0000 (Wed, 11 Apr 2012) | 27 lines + +Fix the build with gcc 4.7.0 +https://bugs.webkit.org/show_bug.cgi?id=83584 +[...] +* html/HTMLImageElement.cpp: +(WebCore::HTMLImageElement::createForJSConstructor): Fails because of -Werror=extra +[...] + +--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig 2015-05-07 14:14:47 UTC ++++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp +@@ -74,7 +74,7 @@ PassRefPtr HTMLImageEl + RefPtr image = adoptRef(new HTMLImageElement(imgTag, document)); + if (optionalWidth) + image->setWidth(*optionalWidth); +- if (optionalHeight > 0) ++ if (optionalHeight) + image->setHeight(*optionalHeight); + return image.release(); + }