<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/49da3e3d0c256cb76e94d4534041be259c405015">https://github.com/macports/macports-ports/commit/49da3e3d0c256cb76e94d4534041be259c405015</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 49da3e3  kdelibs4: fix compilation with errors about int* vs ptr comparisons (fixes https://trac.macports.org/ticket/58354)
</span>49da3e3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 49da3e3d0c256cb76e94d4534041be259c405015
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Sun Apr 21 22:16:20 2019 +0900

<span style='display:block; white-space:pre;color:#404040;'>    kdelibs4: fix compilation with errors about int* vs ptr comparisons (fixes https://trac.macports.org/ticket/58354)
</span>---
 kde/kdelibs4/Portfile                |  3 ++-
 kde/kdelibs4/files/patch-locale.diff | 38 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1686d5..c3d39ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,8 @@ patchfiles           workaround-kdeinit4-crash.patch \
</span>                      patch-cmake-modules-FindKDE4-Internal.cmake.diff \
                      patch-KdePreferences.diff \
                      patch-ui-CMakeLists.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                     patch-FindExiv2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     patch-FindExiv2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     patch-locale.diff
</span> 
 #Deactivated as of ticket #45373
 #                     patch-nativeDialogs.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdelibs4/files/patch-locale.diff b/kde/kdelibs4/files/patch-locale.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..20b9e59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdelibs4/files/patch-locale.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur kdelibs-4.14.3-orig/kdecore/localization/klocale_kde.cpp kdelibs-4.14.3/kdecore/localization/klocale_kde.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kdelibs-4.14.3-orig/kdecore/localization/klocale_kde.cpp       2014-11-07 07:33:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kdelibs-4.14.3/kdecore/localization/klocale_kde.cpp    2019-04-21 11:21:16.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2438,8 +2438,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool KLocalePrivate::use12Clock() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    if ((timeFormat().contains(QString::fromLatin1("%I")) > 0) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        (timeFormat().contains(QString::fromLatin1("%l")) > 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    if ((timeFormat().contains(QString::fromLatin1("%I")) != NULL) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        (timeFormat().contains(QString::fromLatin1("%l")) != NULL)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur kdelibs-4.14.3-orig/kio/kfile/kopenwithdialog.cpp kdelibs-4.14.3/kio/kfile/kopenwithdialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kdelibs-4.14.3-orig/kio/kfile/kopenwithdialog.cpp      2014-11-07 07:33:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kdelibs-4.14.3/kio/kfile/kopenwithdialog.cpp   2019-04-21 11:45:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -713,7 +713,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         // ### indicate that default value was restored
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         d->terminal->setChecked(d->curService->terminal());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         QString terminalOptions = d->curService->terminalOptions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) != NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         d->m_terminaldirty = false; // slotTerminalToggled changed it
</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 kdelibs-4.14.3-orig/kio/kfile/kpropertiesdialog.cpp kdelibs-4.14.3/kio/kfile/kpropertiesdialog.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kdelibs-4.14.3-orig/kio/kfile/kpropertiesdialog.cpp    2014-11-07 07:33:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kdelibs-4.14.3/kio/kfile/kpropertiesdialog.cpp 2019-04-21 13:04:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3306,7 +3306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (preferredTerminal == "konsole")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         w.terminalCloseCheck->setChecked(terminalCloseBool);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         d->m_terminalOptionStr.remove( "--noclose");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span></pre><pre style='margin:0'>

</pre>