<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2db6c9c5ac2c84c7e7092bc16cce78675732234">https://github.com/macports/macports-ports/commit/d2db6c9c5ac2c84c7e7092bc16cce78675732234</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 d2db6c9c5ac kde ports: fix errors of ordered comparison between pointer and zero
</span>d2db6c9c5ac is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d2db6c9c5ac2c84c7e7092bc16cce78675732234
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Tue Jun 23 12:10:06 2020 +0900

<span style='display:block; white-space:pre;color:#404040;'>    kde ports: fix errors of ordered comparison between pointer and zero
</span>---
 kde/khangman/Portfile                  |  3 ++-
 kde/khangman/files/patch-pointers.diff | 21 +++++++++++++++++++++
 kde/kolf/Portfile                      |  4 +++-
 kde/kolf/files/patch-pointers.diff     | 24 ++++++++++++++++++++++++
 kde/ksirk/Portfile                     |  4 +++-
 kde/ksirk/files/patch-pointers.diff    | 12 ++++++++++++
 kde/kturtle/Portfile                   |  2 ++
 kde/kturtle/files/patch-pointers.diff  | 20 ++++++++++++++++++++
 8 files changed, 87 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/khangman/Portfile b/kde/khangman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f3477a19838..bdd15cb792c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/khangman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/khangman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ checksums           rmd160  1a6fda737d5f729989b30e9aa680fb503e971ad5 \
</span> license_noconflict  openssl
 
 #Prevents the package to build a framework
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-CMakeLists-engine.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-CMakeLists-engine.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-pointers.diff
</span> 
 if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/khangman/files/patch-pointers.diff b/kde/khangman/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d88d269cbad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/khangman/files/patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../khangman-4.14.3-orig/src/desktop/khangmanview.cpp ./src/desktop/khangmanview.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../khangman-4.14.3-orig/src/desktop/khangmanview.cpp   2014-08-27 14:30:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/desktop/khangmanview.cpp 2020-04-15 23:02:38.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -510,7 +510,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         int  x = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         int  y = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if (m_missedLetters.contains(guess) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (m_missedLetters.contains(guess) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             // FIXME: popup should be better placed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             QPoint abspos = popup->pos();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -527,7 +527,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             m_letterInput->setEnabled(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if (goodWord.contains(guess) > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if (goodWord.contains(guess) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             point = m_theme->goodWordPos(size(), popup->pos());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             QTimer::singleShot( Prefs::missedTimer() * 1000,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kolf/Portfile b/kde/kolf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f60224fe300..075cd1938d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kolf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kolf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,10 @@ license_noconflict  openssl
</span> depends_lib-append  port:kdelibs4 \
                     port:libkdegames
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-pointers.diff 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset docs]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-CMakeLists.diff
</span> }
 
 livecheck.url       ${kde4.mirror}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kolf/files/patch-pointers.diff b/kde/kolf/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..343dabc1262
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kolf/files/patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kolf-4.14.3-orig/kcomboboxdialog.cpp ./kcomboboxdialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kolf-4.14.3-orig/kcomboboxdialog.cpp        2014-08-27 16:07:13.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./kcomboboxdialog.cpp  2020-04-15 18:39:48.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           KConfigGroup *configGroup = new KConfigGroup(config->group("Notification Messages"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           prevAnswer = configGroup->readEntry( dontAskAgainName,QString() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if ( !prevAnswer.isEmpty() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  if ( _items.contains( prevAnswer ) > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  if ( _items.contains( prevAnswer ) != NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                           return prevAnswer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kolf-4.14.3-orig/newgame.cpp ./newgame.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kolf-4.14.3-orig/newgame.cpp        2014-08-27 16:07:13.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./newgame.cpp  2020-04-15 18:39:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -285,7 +285,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   for (QStringList::const_iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          if (names.contains(*fileIt) > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          if (names.contains(*fileIt) != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   hasDuplicates = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   continue;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/ksirk/Portfile b/kde/ksirk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2223ce0e86..0ebc793f0ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/ksirk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/ksirk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,10 @@ depends_lib-append  port:kdelibs4 \
</span>                     port:libkdegames \
                     port:qca
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span> if {![variant_isset docs]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-CMakeLists.diff
</span> }
 
 livecheck.url       ${kde4.mirror}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/ksirk/files/patch-pointers.diff b/kde/ksirk/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..10d92e6dfb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/ksirk/files/patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../ksirk-4.14.3-orig/ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp ./ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../ksirk-4.14.3-orig/ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp      2014-05-11 07:08:05.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp 2020-04-15 18:54:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,7 +396,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool FileTransferManager::isActive(const FileTransfer *ft) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  return d->list.contains(const_cast<FileTransfer*>(ft)) > 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  return d->list.contains(const_cast<FileTransfer*>(ft)) != NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void FileTransferManager::pft_incoming(const FTRequest &req)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kturtle/Portfile b/kde/kturtle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bedd50e5df..40807eb9ea3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kturtle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kturtle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ checksums           rmd160  e30fa38635925c2e2bb8a704f90e24a161639faa \
</span> #Binaries do not link to openssl, nor use the ssl backend of kdelibs4
 license_noconflict  openssl
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_isset docs]} {
     patchfiles-append   patch-CMakeLists.txt.diff
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kturtle/files/patch-pointers.diff b/kde/kturtle/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..86b1b588d7c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kturtle/files/patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kturtle-4.14.3-orig/src/canvas.cpp ./src/canvas.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kturtle-4.14.3-orig/src/canvas.cpp  2014-10-14 15:52:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/canvas.cpp       2020-04-15 23:32:21.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,11 +209,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Canvas::slotFontType(const QString& family, const QString& extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   textFont->setFamily(family);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  textFont->setBold(extra.contains(i18n("bold")) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  textFont->setItalic(extra.contains(i18n("italic")) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  textFont->setUnderline(extra.contains(i18n("underline")) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  textFont->setOverline(extra.contains(i18n("overline")) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  textFont->setStrikeOut(extra.contains(i18n("strikeout")) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  textFont->setBold(extra.contains(i18n("bold")) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  textFont->setItalic(extra.contains(i18n("italic")) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  textFont->setUnderline(extra.contains(i18n("underline")) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  textFont->setOverline(extra.contains(i18n("overline")) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  textFont->setStrikeOut(extra.contains(i18n("strikeout")) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Canvas::slotReset()
</span></pre><pre style='margin:0'>

</pre>