svn commit: r431846 - branches/2017Q1/www/webkit-qt4/files

[Jan Beich]

Author: jbeich
Date: Thu Jan 19 05:23:15 2017
New Revision: 431846
URL: https://svnweb.freebsd.org/changeset/ports/431846

Log:
  MFH: r431742
  
  www/webkit-qt4: unbreak with clang 4.0
  
  html/HTMLImageElement.cpp:77:24: error: ordered comparison between pointer and zero ('const int *' and 'int')
      if (optionalHeight > 0)
          ~~~~~~~~~~~~~~ ^ ~
  
  PR:		216015
  Regressed by:	https://github.com/llvm-mirror/clang/commit/4b6ad14285f3
  Obtained from:	upstream (excerpt)
  Approved by:	portmgr blanket
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
     - copied unchanged from r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
Modified:
Directory Properties:
  branches/2017Q1/   (props changed)

Copied: branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp (from r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp	Thu Jan 19 05:23:15 2017	(r431846, copy of r431742, head/www/webkit-qt4/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp)
@@ -0,0 +1,21 @@
+------------------------------------------------------------------------
+r113848 | abecsi at 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<HTMLImageElement> HTMLImageEl
+     RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
+     if (optionalWidth)
+         image->setWidth(*optionalWidth);
+-    if (optionalHeight > 0)
++    if (optionalHeight)
+         image->setHeight(*optionalHeight);
+     return image.release();
+ }