<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/da2fc1969369c5574cf7c0931cb4087ab30bd6dc">https://github.com/macports/macports-ports/commit/da2fc1969369c5574cf7c0931cb4087ab30bd6dc</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 da2fc196936 kdelibs4: fix compilation issue (see https://trac.macports.org/ticket/62105)
</span>da2fc196936 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit da2fc1969369c5574cf7c0931cb4087ab30bd6dc
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Thu May 6 13:36:34 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdelibs4: fix compilation issue (see https://trac.macports.org/ticket/62105)
</span>---
kde/kdelibs4/Portfile | 3 ++-
kde/kdelibs4/files/patch-pointers.diff | 12 ++++++++++++
2 files changed, 14 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 f38cd5de043..6f8123ca269 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;'>@@ -71,7 +71,8 @@ patchfiles workaround-kdeinit4-crash.patch \
</span> patch-ui-CMakeLists.diff \
patch-FindExiv2.diff \
patch-locale.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- kdelibs-openssl-1.1.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kdelibs-openssl-1.1.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pointers.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-pointers.diff b/kde/kdelibs4/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..39b0b823d8d
</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-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 kdelibs-4.14.3-orig/kdeui/itemviews/kselectionproxymodel.cpp kdelibs-4.14.3/kdeui/itemviews/kselectionproxymodel.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- kdelibs-4.14.3-orig/kdeui/itemviews/kselectionproxymodel.cpp 2014-11-07 07:33:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ kdelibs-4.14.3/kdeui/itemviews/kselectionproxymodel.cpp 2021-03-27 16:59:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2144,7 +2144,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!proxyIndex.isValid() || !sourceModel() || d->m_rootIndexList.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return QModelIndex();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Q_ASSERT(proxyIndex.internalPointer() >= 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Q_ASSERT(proxyIndex.internalPointer() != NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(proxyIndex.model() == this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (proxyIndex.internalPointer() == 0)
</span></pre><pre style='margin:0'>
</pre>