<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/2198debd25b02bcf7f6b17f79b415690449a85f0">https://github.com/macports/macports-ports/commit/2198debd25b02bcf7f6b17f79b415690449a85f0</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 2198deb kdepimlibs4: Fix build (fix: https://trac.macports.org/ticket/55056)
</span>2198deb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2198debd25b02bcf7f6b17f79b415690449a85f0
</span>Author: Nicolas Pavillon <nicos@macports.org>
AuthorDate: Fri Oct 13 22:22:43 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdepimlibs4: Fix build (fix: https://trac.macports.org/ticket/55056)
</span>---
kde/kdepimlibs4/Portfile | 5 ++--
.../files/patch-do_not_include_cpp.diff | 28 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepimlibs4/Portfile b/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40f0a7b..f56b120 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepimlibs4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name kdepimlibs4
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> categories kde kde4
maintainers nicos
license GPL-2+ LGPL-2+ BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ depends_lib-append port:kdelibs4 \
</span> port:gpgme
#Suppress build of kioslaves which conflict with openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-do_not_include_cpp.diff
</span>
configure.args-append -DMAILTRANSPORT_INPROCESS_SMTP=Off
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepimlibs4/files/patch-do_not_include_cpp.diff b/kde/kdepimlibs4/files/patch-do_not_include_cpp.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0a512a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepimlibs4/files/patch-do_not_include_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -u -r ../kdepimlibs-4.14.3-orig/./akonadi/tests/actionstatemanagertest.cpp ./akonadi/tests/actionstatemanagertest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/./akonadi/tests/actionstatemanagertest.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./akonadi/tests/actionstatemanagertest.cpp 2017-10-13 21:42:25.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,8 +27,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../actionstatemanager.cpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef QT_NO_CLIPBOARD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "../pastehelper.cpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef QHash<Akonadi::StandardActionManager::Type, bool> StateMap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_DECLARE_METATYPE( StateMap )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -u -r ../kdepimlibs-4.14.3-orig/./akonadi/tests/collectionsynctest.cpp ./akonadi/tests/collectionsynctest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepimlibs-4.14.3-orig/./akonadi/tests/collectionsynctest.cpp 2014-11-05 06:19:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./akonadi/tests/collectionsynctest.cpp 2017-10-13 21:41:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,9 +25,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <akonadi/collection.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <akonadi/collectionfetchjob.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <akonadi/collectionfetchscope.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <collectiondeletejob.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <collectionmodifyjob.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <akonadi/entitydisplayattribute.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "../akonadi/collectionsync.cpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "../akonadi/collectionsync_p.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <krandom.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>