<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a12f8d370932d171fef29d833717b07b1b1e742a">https://github.com/macports/macports-ports/commit/a12f8d370932d171fef29d833717b07b1b1e742a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new a12f8d3  qt4-mac: Fix pointer comparison with 0.
</span>a12f8d3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a12f8d370932d171fef29d833717b07b1b1e742a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 24 10:28:58 2017 -0400

<span style='display:block; white-space:pre;color:#404040;'>    qt4-mac: Fix pointer comparison with 0.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Addresses ticket https://trac.macports.org/ticket/54183 .
</span>---
 aqua/qt4-mac/Portfile                              |  5 +++++
 .../files/patch-fix_pointer_comparison_to_0.diff   | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index afd319d..da02bc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -287,6 +287,11 @@ platform darwin {
</span> 
 patchfiles-append patch-better-invalid-fonttable-handling.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# (29) Fix pointer comparison with 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These error out on clang 4.0, whereas they didn't in 3.9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix_pointer_comparison_to_0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error out if trying to build on a new OSX version (> 10.12).
 
 platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/files/patch-fix_pointer_comparison_to_0.diff b/aqua/qt4-mac/files/patch-fix_pointer_comparison_to_0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4ed86aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/files/patch-fix_pointer_comparison_to_0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (optionalWidth)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         image->setWidth(*optionalWidth);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    if (optionalHeight > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if (optionalHeight)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         image->setHeight(*optionalHeight);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     return image.release();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/linguist/linguist/messagemodel.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/linguist/linguist/messagemodel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (ContextItem *c = one->findContext(oc->context())) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             for (int j = 0; j < oc->messageCount(); ++j) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 MessageItem *m = oc->messageItem(j);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                if (c->findMessage(m->text(), m->comment()) >= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                if (c->findMessage(m->text(), m->comment()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     ++inBoth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         }
</span></pre><pre style='margin:0'>

</pre>