aboutsummaryrefslogtreecommitdiffstats
path: root/converters
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-01-21 11:23:18 +0800
committerjbeich <jbeich@FreeBSD.org>2017-01-21 11:23:18 +0800
commit1a1a62fef989e64aa2c90a6f52c5caa06b87d352 (patch)
tree9099932d46eaca6eb64a30e4f6355703567c8747 /converters
parent6994807e24faf562836d03c91d7506411540cd9c (diff)
downloadfreebsd-ports-gnome-1a1a62fef989e64aa2c90a6f52c5caa06b87d352.tar.gz
freebsd-ports-gnome-1a1a62fef989e64aa2c90a6f52c5caa06b87d352.tar.zst
freebsd-ports-gnome-1a1a62fef989e64aa2c90a6f52c5caa06b87d352.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
Diffstat (limited to 'converters')
-rw-r--r--converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp21
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();
+ }