diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-01-21 03:23:18 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-01-21 03:23:18 +0000 |
| commit | 277cfd47235d08533b31cb4d93c5678454db685a (patch) | |
| tree | 9099932d46eaca6eb64a30e4f6355703567c8747 /converters/wkhtmltopdf | |
| parent | 58efcc8181d7a8a7488d7adaaf77f26dddc38f16 (diff) | |
| download | ports-277cfd47235d08533b31cb4d93c5678454db685a.tar.gz ports-277cfd47235d08533b31cb4d93c5678454db685a.zip | |
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
Notes
Notes:
svn path=/head/; revision=432009
Diffstat (limited to 'converters/wkhtmltopdf')
| -rw-r--r-- | converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp new file mode 100644 index 000000000000..bfff55a7a1b6 --- /dev/null +++ b/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<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(); + } |